Merge pull request #973 from IvanNardi/esni3
Add risk flag about suspicious ESNI usage
This commit is contained in:
+2
-1
@@ -312,6 +312,7 @@ typedef enum {
|
||||
NDPI_SSH_OBSOLETE_CLIENT_VERSION_OR_CIPHER,
|
||||
NDPI_SSH_OBSOLETE_SERVER_VERSION_OR_CIPHER,
|
||||
NDPI_SMB_INSECURE_VERSION,
|
||||
NDPI_TLS_SUSPICIOUS_ESNI_USAGE,
|
||||
/* Leave this as last member */
|
||||
NDPI_MAX_RISK
|
||||
} ndpi_risk_enum;
|
||||
@@ -1446,4 +1447,4 @@ class NDPI():
|
||||
def ndpi_exit_detection_module(self):
|
||||
""" Exit function for nDPI module """
|
||||
self._ndpi.ndpi_exit_detection_module(self._mod)
|
||||
self._ffi.dlclose(self._ndpi)
|
||||
self._ffi.dlclose(self._ndpi)
|
||||
|
||||
@@ -79,6 +79,7 @@ typedef enum {
|
||||
NDPI_SSH_OBSOLETE_CLIENT_VERSION_OR_CIPHER,
|
||||
NDPI_SSH_OBSOLETE_SERVER_VERSION_OR_CIPHER,
|
||||
NDPI_SMB_INSECURE_VERSION,
|
||||
NDPI_TLS_SUSPICIOUS_ESNI_USAGE,
|
||||
|
||||
/* Leave this as last member */
|
||||
NDPI_MAX_RISK
|
||||
|
||||
@@ -1533,7 +1533,10 @@ const char* ndpi_risk2str(ndpi_risk_enum risk) {
|
||||
|
||||
case NDPI_SMB_INSECURE_VERSION:
|
||||
return("SMB Insecure Version");
|
||||
|
||||
|
||||
case NDPI_TLS_SUSPICIOUS_ESNI_USAGE:
|
||||
return("TLS Suspicious ESNI Usage");
|
||||
|
||||
default:
|
||||
snprintf(buf, sizeof(buf), "%d", (int)risk);
|
||||
return(buf);
|
||||
|
||||
@@ -1434,6 +1434,11 @@ int processClientServerHello(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
NDPI_SET_BIT(flow->risk, NDPI_TLS_NOT_CARRYING_HTTPS);
|
||||
}
|
||||
|
||||
if(flow->protos.stun_ssl.ssl.encrypted_sni.esni &&
|
||||
flow->protos.stun_ssl.ssl.client_requested_server_name[0] != '\0') {
|
||||
NDPI_SET_BIT(flow->risk, NDPI_TLS_SUSPICIOUS_ESNI_USAGE);
|
||||
}
|
||||
|
||||
return(2 /* Client Certificate */);
|
||||
} else {
|
||||
#ifdef DEBUG_TLS
|
||||
|
||||
Reference in New Issue
Block a user