wildfly-security / wildfly-openssl

Generic OpenSSL bindings for Java
Apache License 2.0
81 stars 72 forks source link

[WFSSL-76] Add parameter validation in ByteBufferUtils#expand method #108

Closed totorororo closed 3 years ago

totorororo commented 3 years ago

[WFSSL-76] Add parameter validation in ByteBufferUtils#expand method https://issues.redhat.com/browse/WFSSL-76?filter=-1

fjuma commented 3 years ago

Just noticed this message in the CI log:

Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.8.0-jboss-2:compile (default-compile) on project wildfly-openssl-java: Compilation failure: Compilation failure: 
Error:  /home/runner/work/wildfly-openssl/wildfly-openssl/java/src/main/java/org/wildfly/openssl/ByteBufferUtils.java:[21,26] package org.wildfly.common does not exist
Error:  /home/runner/work/wildfly-openssl/wildfly-openssl/java/src/main/java/org/wildfly/openssl/ByteBufferUtils.java:[59,9] cannot find symbol
Error:    symbol:   variable Assert
Error:    location: class org.wildfly.openssl.ByteBufferUtils

To fix this, you'll also need to add a dependency on org.wildfly.common:wildfly-common in the pom.xml and java/pom.xml files. Again, feel free to ask if you have any questions about this.

Thanks!

totorororo commented 3 years ago

Hi, could you provide more details about adding the dependencies.The dependencies in pom.xml has tags: groupID, articfactID, version and scope. What would be the version and scope for org.wildfly.common?

Ashpan commented 3 years ago

@totorororo Thank you for the PR! For the dependencies, in the root pom.xml, use the following values groupId: org.wildfly.common artifactId: wildfly-common version: 1.5.4.Final For the java pom.xml use the same values but you can omit the version tag.

Ashpan commented 3 years ago

Great! Just one last thing is we like to squash our commits into 1 commit with the issue number and the issue title (just like the title of this PR). To do this you're going to run git rebase -i HEAD~3 You'll see an output like

pick 6286248 WFSSL-76
pick 808cfae code style and capacity update
pick 967722d updated dependencies and coding style

If you change it to

reword 6286248 WFSSL-76
squash 808cfae code style and capacity update
squash 967722d updated dependencies and coding style

and then save that file, it will let you rename your commit message ([WFSSL-76] Add parameter validation in ByteBufferUtils#expand method) and will also combine the 3 commits together. Let me know if you have any questions about that 🙂

totorororo commented 3 years ago

I'm a bit stuck on this. After I changed the rebase commands, how do I save? It is not a file but in the git bash.

Ashpan commented 3 years ago

Ah so in git bash it is using the "vim" text editor to edit the file. To save the file, type :wq and then hit Enter

Ashpan commented 3 years ago

@totorororo It looks like the squash didn't work successfully, we now have 2 more commits, probably due to a mishap in the rebase (this happens all the time dont worry!). Could you try to follow this site and see if it helps squashing the 5 commits into 1 https://www.internalpointers.com/post/squash-commits-into-one-git

If you would rather you could also join the public chat stream we have on Zulip and I can assist you step by step https://wildfly.zulipchat.com/#narrow/stream/173102-wildfly-elytron

fjuma commented 3 years ago

Thanks very much for the updates, @totorororo!