Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: changes to close ELY-2595,2596,2597,2603,2605,2606,2607 #1996

Merged
merged 7 commits into from
Oct 12, 2023
Merged

refactor: changes to close ELY-2595,2596,2597,2603,2605,2606,2607 #1996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0400fe2
[ELY-2603] replace switch statement with if condition to improve read…
abhishek-nigam Oct 6, 2023
50f5108
[ELY-2596] add missing @Override annotation on override method
abhishek-nigam Oct 6, 2023
6dbf7f9
[ELY-2607] directly append iterationCount(int) to String instead of u…
abhishek-nigam Oct 6, 2023
7529e89
[ELY-2606] make two Elytron class data members final
abhishek-nigam Oct 6, 2023
96f93ef
[ELY-2605] make two CredentialStoreCommand class data members final
abhishek-nigam Oct 6, 2023
e681ae5
[ELY-2595] remove unused parameter
abhishek-nigam Oct 6, 2023
4c62141
[ELY-2597] merge if statements in verifyCertificate method
abhishek-nigam Oct 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions auth/client/src/main/java/org/wildfly/security/auth/client/ElytronXmlParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,13 +714,10 @@ private static void parseCertificateRevocationLists(ConfigurationXMLStreamReader
while (reader.hasNext()) {
final int tag = reader.nextTag();
if (tag == START_ELEMENT) {
switch (reader.getLocalName()) {
case "certificate-revocation-list": {
parseCertificateRevocationList(reader, builder, xmlVersion, true);
break;
}
default:
throw reader.unexpectedElement();
if (reader.getLocalName().equals("certificate-revocation-list")) {
parseCertificateRevocationList(reader, builder, xmlVersion, true);
} else {
throw reader.unexpectedElement();
}
} else if (tag != END_ELEMENT) {
throw reader.unexpectedContent();
Expand Down
5 changes: 3 additions & 2 deletions auth/realm/base/src/main/java/org/wildfly/security/auth/realm/FileSystemSecurityRealm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1000,7 +1000,7 @@ private Void replaceIdentityPrivileged(final LoadedIdentity newIdentity) throws
}
}

private Version requiredVersion(final LoadedIdentity identityToWrite) {
private Version requiredVersion() {
// As new functionality is added we will identify if we need to use a later version
// if new functionality is used then use the required schema version otherwise fallback
// to an older version.
Expand All @@ -1018,7 +1018,7 @@ private void writeIdentity(final XMLStreamWriter streamWriter, final LoadedIdent
streamWriter.writeStartDocument();
streamWriter.writeCharacters("\n");
streamWriter.writeStartElement("identity");
streamWriter.writeDefaultNamespace(requiredVersion(newIdentity).getNamespace());
streamWriter.writeDefaultNamespace(requiredVersion().getNamespace());

if (integrityEnabled) {
streamWriter.writeCharacters("\n ");
Expand Down Expand Up @@ -1099,6 +1099,7 @@ private void writeIdentity(final XMLStreamWriter streamWriter, final LoadedIdent
streamWriter.writeEndDocument();
}

@Override
public void dispose() {
// Release the lock for this realm identity
IdentityLock identityLock = lock;
Expand Down
6 changes: 2 additions & 4 deletions auth/realm/ldap/src/main/java/org/wildfly/security/auth/realm/ldap/X509EvidenceVerifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,10 +176,8 @@ public boolean verifyCertificate(X509Certificate certificate, Attributes attribu

for (int i = 0; i < size; i++) {
Object attrDigest = attribute.get(i);
if (attrDigest != null){
if (digest.equalsIgnoreCase((String) attrDigest)) {
return true;
}
if (attrDigest != null && digest.equalsIgnoreCase((String) attrDigest)){
return true;
}
}
} catch (NoSuchAlgorithmException | CertificateEncodingException e) {
Expand Down
4 changes: 2 additions & 2 deletions tool/src/main/java/org/wildfly/security/tool/CredentialStoreCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@
*/
class CredentialStoreCommand extends Command {

public static int ACTION_NOT_DEFINED = 5;
public static int ALIAS_NOT_FOUND = 6;
public static final int ACTION_NOT_DEFINED = 5;
public static final int ALIAS_NOT_FOUND = 6;

public static final String RSA_ALGORITHM = "RSA";
public static final String DSA_ALGORITHM = "DSA";
Expand Down
4 changes: 2 additions & 2 deletions tool/src/main/java/org/wildfly/security/tool/ElytronTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ public class ElytronTool {
/**
* status code for unrecognized command
*/
public static int ElytronToolExitStatus_unrecognizedCommand = 1;
public static final int ElytronToolExitStatus_unrecognizedCommand = 1;
/**
* status code for no problems
*/
public static int ElytronToolExitStatus_OK = 0;
public static final int ElytronToolExitStatus_OK = 0;

private Map<String, Command> commandRegistry = new HashMap<>();
/**
Expand Down
2 changes: 1 addition & 1 deletion tool/src/main/java/org/wildfly/security/tool/VaultCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ private void printSummary (String keystorePassword, String salt, int iterationCo
if (keystorePassword != null) {
password = keystorePassword;
if (salt != null && iterationCount > -1) {
password = keystorePassword.startsWith(MASK_PREFIX) ? keystorePassword + ";" + salt + ";" + String.valueOf(iterationCount)
password = keystorePassword.startsWith(MASK_PREFIX) ? keystorePassword + ";" + salt + ";" + iterationCount
: MaskCommand.computeMasked(keystorePassword, salt, iterationCount);
}
}
Expand Down
Loading