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

PAYARA-3789 Unify DN Representation #4042

Merged
merged 11 commits into from
Jun 17, 2019
Merged

PAYARA-3789 Unify DN Representation #4042

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8b4a2d1
PAYARA-3789 Unify DN output and allow EMAILADDRESS
Pandrex247 Jun 11, 2019
00f2eca
PAYARA-3789 Don't use deprecated methods
Pandrex247 Jun 11, 2019
5f8551c
PAYARA-3789 Add more robust name generation
Pandrex247 Jun 12, 2019
a48c875
Remove unused imports
Pandrex247 Jun 12, 2019
8ebfbec
PAYARA-3789 Make sure all usages are in the same format
Pandrex247 Jun 12, 2019
c1ce43e
PAYARA-3789 Another missed getName
Pandrex247 Jun 12, 2019
143eb93
PAYARA-3789 Don't use variables from class
Pandrex247 Jun 12, 2019
93af14b
PAYARA-3789 Move OIDs into constants class
Pandrex247 Jun 13, 2019
1f96686
PAYARA-3789 Correct DN attribute name
Pandrex247 Jun 13, 2019
9e5d6ae
Merge branch 'master' of https://github.com/payara/Payara into PAYARA…
Pandrex247 Jun 14, 2019
9611222
PAYARA-3789 Variable formatting
Pandrex247 Jun 17, 2019
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
42 changes: 20 additions & 22 deletions ...re/src/main/java/com/sun/enterprise/security/auth/realm/certificate/CertificateRealm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,6 @@
import com.sun.enterprise.security.auth.realm.NoSuchRealmException;
import com.sun.enterprise.security.auth.realm.NoSuchUserException;
import com.sun.enterprise.security.auth.realm.Realm;
import sun.security.pkcs.PKCS9Attribute;
import sun.security.x509.X500Name;

/**
* Realm wrapper for supporting certificate authentication.
Expand Down Expand Up @@ -108,26 +106,26 @@ public final class CertificateRealm extends BaseRealm {
public static final Map<String, String> oidMap;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OID_MAP as name?

static {
Map<String, String> oidMapInitialiser = new HashMap<>();
oidMapInitialiser.put(X500Name.commonName_oid.toString(), "CN");
oidMapInitialiser.put(X500Name.countryName_oid.toString(), "C");
oidMapInitialiser.put(X500Name.localityName_oid.toString(), "L");
oidMapInitialiser.put(X500Name.stateName_oid.toString(), "S");
oidMapInitialiser.put(X500Name.stateName_oid.toString(), "ST");
oidMapInitialiser.put(X500Name.orgName_oid.toString(), "O");
oidMapInitialiser.put(X500Name.orgUnitName_oid.toString(), "OU");
oidMapInitialiser.put(X500Name.title_oid.toString(), "T");
oidMapInitialiser.put(X500Name.ipAddress_oid.toString(), "IP");
oidMapInitialiser.put(X500Name.streetAddress_oid.toString(), "STREET");
oidMapInitialiser.put(X500Name.DOMAIN_COMPONENT_OID.toString(), "DC");
oidMapInitialiser.put(X500Name.DNQUALIFIER_OID.toString(), "DNQUALIFIER");
oidMapInitialiser.put(X500Name.SURNAME_OID.toString(), "SURNAME");
oidMapInitialiser.put(X500Name.GIVENNAME_OID.toString(), "GIVENNAME");
oidMapInitialiser.put(X500Name.INITIALS_OID.toString(), "INITIALS");
oidMapInitialiser.put(X500Name.GENERATIONQUALIFIER_OID.toString(), "GENERATION");
oidMapInitialiser.put(PKCS9Attribute.EMAIL_ADDRESS_OID.toString(), "EMAIL");
oidMapInitialiser.put(PKCS9Attribute.EMAIL_ADDRESS_OID.toString(), "EMAILADDRESS");
oidMapInitialiser.put(X500Name.userid_oid.toString(), "UID");
oidMapInitialiser.put(X500Name.SERIALNUMBER_OID.toString(), "SERIALNUMBER");
oidMapInitialiser.put("0.9.2342.19200300.100.1.1", "UID");
oidMapInitialiser.put("0.9.2342.19200300.100.1.25", "DC");
oidMapInitialiser.put("1.2.840.113549.1.9.1", "EMAIL");
oidMapInitialiser.put("1.2.840.113549.1.9.1", "EMAILADDRESS");
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Duplicate, so always EMAILADDRESS used and never EMAIL.

oidMapInitialiser.put("1.3.6.1.4.1.42.2.11.2.1", "IP");
oidMapInitialiser.put("2.5.4.3", "CN");
oidMapInitialiser.put("2.5.4.4", "SURNAME");
oidMapInitialiser.put("2.5.4.5", "SERIALNUMBER");
oidMapInitialiser.put("2.5.4.6", "C");
oidMapInitialiser.put("2.5.4.7", "L");
oidMapInitialiser.put("2.5.4.8", "S");
oidMapInitialiser.put("2.5.4.8", "ST");
oidMapInitialiser.put("2.5.4.9", "STREET");
oidMapInitialiser.put("2.5.4.10", "O");
oidMapInitialiser.put("2.5.4.11", "OU");
oidMapInitialiser.put("2.5.4.12", "T");
oidMapInitialiser.put("2.5.4.42", "GIVENNAME");
oidMapInitialiser.put("2.5.4.43", "INITIALS");
oidMapInitialiser.put("2.5.4.44", "GENERATION");
oidMapInitialiser.put("2.5.4.46", "DNQUALIFIER");
oidMap = Collections.unmodifiableMap(oidMapInitialiser);
}

Expand Down