Skip to content

Remove code that trusts all certificates. #53

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

Open
intrigus-lgtm wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove code that trusts all certificates. #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 1 addition & 39 deletions ...agement-service/src/main/java/org/ojbc/web/consentmanagement/service/SamlServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,45 +75,7 @@ Element retrieveAssertionFromShibboleth(HttpServletRequest request) throws Excep
{

LOG.info("Attempt to retrieve from Shibboleth.");


// Note: pulled this straight from Andrew's demo JSP that displays the assertion and http request...

/*
* fix for Exception in thread "main" javax.net.ssl.SSLHandshakeException:
* sun.security.validator.ValidatorException:
* PKIX path building failed: sun.security.provider.certpath.SunCertPathBuilderException:
* unable to find valid certification path to requested target
*/
TrustManager[] trustAllCerts = new TrustManager[]{
new X509TrustManager() {
public java.security.cert.X509Certificate[] getAcceptedIssuers() {
return null;
}
public void checkClientTrusted(
java.security.cert.X509Certificate[] certs, String authType) {
}
public void checkServerTrusted(
java.security.cert.X509Certificate[] certs, String authType) {
}
}
};
SSLContext sc = SSLContext.getInstance("SSL");
sc.init(null, trustAllCerts, new java.security.SecureRandom());
HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());

// Create all-trusting host name verifier
HostnameVerifier allHostsValid = new HostnameVerifier() {
@Override
public boolean verify(String arg0, SSLSession arg1) {
return true; // andrew had this as false...dont know how that would work...
}
};
// Install the all-trusting host verifier
HttpsURLConnection.setDefaultHostnameVerifier(allHostsValid);
/*
* end of the fix
*/

//Hard coded to pick up a single assertion...could loop through assertion headers if there will be more than one
String assertionHttpHeaderName = request.getHeader("shib-assertion-01");
LOG.info("Loading assertion from: " + assertionHttpHeaderName);
Expand Down
37 changes: 0 additions & 37 deletions web/ojb-web-portal/src/main/java/org/ojbc/web/portal/services/SamlServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,43 +76,6 @@ public Element getSamlAssertion(HttpServletRequest request) {
Element retrieveAssertionFromShibboleth(HttpServletRequest request) throws Exception
{
if (request == null) return null;
// Note: pulled this straight from Andrew's demo JSP that displays the assertion and http request...

/*
* fix for Exception in thread "main" javax.net.ssl.SSLHandshakeException:
* sun.security.validator.ValidatorException:
* PKIX path building failed: sun.security.provider.certpath.SunCertPathBuilderException:
* unable to find valid certification path to requested target
*/
TrustManager[] trustAllCerts = new TrustManager[]{
new X509TrustManager() {
public java.security.cert.X509Certificate[] getAcceptedIssuers() {
return null;
}
public void checkClientTrusted(
java.security.cert.X509Certificate[] certs, String authType) {
}
public void checkServerTrusted(
java.security.cert.X509Certificate[] certs, String authType) {
}
}
};
SSLContext sc = SSLContext.getInstance("SSL");
sc.init(null, trustAllCerts, new java.security.SecureRandom());
HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());

// Create all-trusting host name verifier
HostnameVerifier allHostsValid = new HostnameVerifier() {
@Override
public boolean verify(String arg0, SSLSession arg1) {
return true; // andrew had this as false...dont know how that would work...
}
};
// Install the all-trusting host verifier
HttpsURLConnection.setDefaultHostnameVerifier(allHostsValid);
/*
* end of the fix
*/
//Hard coded to pick up a single assertion...could loop through assertion headers if there will be more than one
String assertionHttpHeaderName = request.getHeader("Shib-Assertion-01");
LOG.info("Loading assertion from: " + assertionHttpHeaderName);
Expand Down
35 changes: 0 additions & 35 deletions web/ojb-web-util/src/main/java/org/ojbc/web/ShibbolethSamlAssertionRetriever.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,6 @@ public class ShibbolethSamlAssertionRetriever {
*/
public static final String retrieveAssertion(HttpServletRequest request) throws Exception {

fixCertificatePathError();

String mode = request.getParameter(MODE_KEY);

if (mode == null)
Expand Down Expand Up @@ -114,37 +112,4 @@ public static final String retrieveAssertion(HttpServletRequest request) throws

}

private static void fixCertificatePathError() throws GeneralSecurityException {
/*
* fix for Exception in thread "main" javax.net.ssl.SSLHandshakeException: sun.security.validator.ValidatorException: PKIX path building failed:
* sun.security.provider.certpath.SunCertPathBuilderException: unable to find valid certification path to requested target
*/
TrustManager[] trustAllCerts = new TrustManager[] {
new X509TrustManager() {
public X509Certificate[] getAcceptedIssuers() {
return null;
}

public void checkClientTrusted(X509Certificate[] certs, String authType) {
}

public void checkServerTrusted(X509Certificate[] certs, String authType) {
}
}
};
SSLContext sc = SSLContext.getInstance("SSL");
sc.init(null, trustAllCerts, new java.security.SecureRandom());
HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());

// Create all-trusting host name verifier
HostnameVerifier allHostsValid = new HostnameVerifier() {
@Override
public boolean verify(String arg0, SSLSession arg1) {
return true;
}
};
// Install the all-trusting host verifier
HttpsURLConnection.setDefaultHostnameVerifier(allHostsValid);
}

}