Skip to content

Fix - [CodeQL.SM03853] Removing that accepts all certificates, Fixes AB#3064771 #2519

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

Merged
merged 2 commits into from
Oct 14, 2024
Merged

Fix - [CodeQL.SM03853] Removing that accepts all certificates, Fixes AB#3064771 #2519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a2aa46
Fix - [CodeQL.SM03853] Removing `TrustManager` that accepts all certi…
iamgusain Oct 7, 2024
cc09609
Merge branch 'dev' into amgusain/codeql_sm03853
iamgusain Oct 10, 2024
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
81 changes: 30 additions & 51 deletions keyvault/src/main/java/com/microsoft/identity/internal/test/keyvault/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,26 @@
import com.microsoft.identity.internal.test.keyvault.auth.ApiKeyAuth;
import com.microsoft.identity.internal.test.keyvault.auth.Authentication;
import com.microsoft.identity.internal.test.keyvault.auth.HttpBasicAuth;
import com.squareup.okhttp.*;
import com.microsoft.identity.internal.test.keyvault.auth.OAuth;
import com.squareup.okhttp.Call;
import com.squareup.okhttp.Callback;
import com.squareup.okhttp.FormEncodingBuilder;
import com.squareup.okhttp.Headers;
import com.squareup.okhttp.MediaType;
import com.squareup.okhttp.MultipartBuilder;
import com.squareup.okhttp.OkHttpClient;
import com.squareup.okhttp.Protocol;
import com.squareup.okhttp.Request;
import com.squareup.okhttp.RequestBody;
import com.squareup.okhttp.Response;
import com.squareup.okhttp.internal.http.HttpMethod;
import com.squareup.okhttp.logging.HttpLoggingInterceptor;
import com.squareup.okhttp.logging.HttpLoggingInterceptor.Level;
import okio.BufferedSink;
import okio.Okio;

import org.threeten.bp.LocalDate;
import org.threeten.bp.OffsetDateTime;
import org.threeten.bp.format.DateTimeFormatter;

import javax.net.ssl.*;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
Expand All @@ -38,17 +47,28 @@
import java.security.KeyStore;
import java.security.SecureRandom;
import java.security.cert.Certificate;
import java.security.cert.CertificateException;
import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
import java.text.DateFormat;
import java.util.*;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import com.microsoft.identity.internal.test.keyvault.auth.OAuth;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.KeyManager;
import javax.net.ssl.SSLContext;
import javax.net.ssl.TrustManager;
import javax.net.ssl.TrustManagerFactory;

import okio.BufferedSink;
import okio.Okio;

public class ApiClient {

Expand All @@ -67,7 +87,6 @@ public class ApiClient {
private int dateLength;

private InputStream sslCaCert;
private boolean verifyingSsl;
private KeyManager[] keyManagers;

private OkHttpClient httpClient;
Expand All @@ -90,8 +109,6 @@ public ApiClient(final String basePathParam) {

basePath = basePathParam;

verifyingSsl = true;

json = new JSON();

// Set default User-Agent.
Expand Down Expand Up @@ -173,29 +190,6 @@ public ApiClient setJSON(JSON json) {
return this;
}

/**
* True if isVerifyingSsl flag is on
*
* @return True if isVerifySsl flag is on
*/
public boolean isVerifyingSsl() {
return verifyingSsl;
}

/**
* Configure whether to verify certificate and hostname when making https requests.
* Default to true.
* NOTE: Do NOT set to false in production code, otherwise you would face multiple types of cryptographic attacks.
*
* @param verifyingSsl True to verify TLS/SSL connection
* @return ApiClient
*/
public ApiClient setVerifyingSsl(boolean verifyingSsl) {
this.verifyingSsl = verifyingSsl;
applySslSettings();
return this;
}

/**
* Get SSL CA cert.
*
Expand Down Expand Up @@ -1161,28 +1155,13 @@ public String guessContentTypeFromFile(File file) {

/**
* Apply SSL related settings to httpClient according to the current values of
* verifyingSsl and sslCaCert.
* sslCaCert.
*/
private void applySslSettings() {
try {
TrustManager[] trustManagers = null;
HostnameVerifier hostnameVerifier = null;
if (!verifyingSsl) {
TrustManager trustAll = new X509TrustManager() {
@Override
public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {}
@Override
public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {}
@Override
public X509Certificate[] getAcceptedIssuers() { return null; }
};
SSLContext sslContext = SSLContext.getInstance("TLS");
trustManagers = new TrustManager[]{ trustAll };
hostnameVerifier = new HostnameVerifier() {
@Override
public boolean verify(String hostname, SSLSession session) { return true; }
};
} else if (sslCaCert != null) {
if (sslCaCert != null) {
char[] password = null; // Any password will work.
CertificateFactory certificateFactory = CertificateFactory.getInstance("X.509");
Collection<? extends Certificate> certificates = certificateFactory.generateCertificates(sslCaCert);
Expand Down
45 changes: 2 additions & 43 deletions labapi/src/main/java/com/microsoft/identity/internal/test/labapi/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ public class ApiClient {
private int dateLength;

private InputStream sslCaCert;
private boolean verifyingSsl;
private KeyManager[] keyManagers;

private OkHttpClient httpClient;
Expand All @@ -92,8 +91,6 @@ public ApiClient(final String basePathParam) {

basePath = basePathParam;

verifyingSsl = true;

json = new JSON();

// Set default User-Agent.
Expand Down Expand Up @@ -168,29 +165,6 @@ public ApiClient setJSON(JSON json) {
return this;
}

/**
* True if isVerifyingSsl flag is on
*
* @return True if isVerifySsl flag is on
*/
public boolean isVerifyingSsl() {
return verifyingSsl;
}

/**
* Configure whether to verify certificate and hostname when making https requests.
* Default to true.
* NOTE: Do NOT set to false in production code, otherwise you would face multiple types of cryptographic attacks.
*
* @param verifyingSsl True to verify TLS/SSL connection
* @return ApiClient
*/
public ApiClient setVerifyingSsl(boolean verifyingSsl) {
this.verifyingSsl = verifyingSsl;
applySslSettings();
return this;
}

/**
* Get SSL CA cert.
*
Expand Down Expand Up @@ -1159,28 +1133,13 @@ public String guessContentTypeFromFile(File file) {

/**
* Apply SSL related settings to httpClient according to the current values of
* verifyingSsl and sslCaCert.
* sslCaCert.
*/
private void applySslSettings() {
try {
TrustManager[] trustManagers = null;
HostnameVerifier hostnameVerifier = null;
if (!verifyingSsl) {
TrustManager trustAll = new X509TrustManager() {
@Override
public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {}
@Override
public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {}
@Override
public X509Certificate[] getAcceptedIssuers() { return null; }
};
SSLContext sslContext = SSLContext.getInstance("TLS");
trustManagers = new TrustManager[]{ trustAll };
hostnameVerifier = new HostnameVerifier() {
@Override
public boolean verify(String hostname, SSLSession session) { return true; }
};
} else if (sslCaCert != null) {
if (sslCaCert != null) {
char[] password = null; // Any password will work.
CertificateFactory certificateFactory = CertificateFactory.getInstance("X.509");
Collection<? extends Certificate> certificates = certificateFactory.generateCertificates(sslCaCert);
Expand Down
Loading