Merge origin/master into maven-deploy

Author: ic0ns

Attacks/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.rub.nds.tlsattacker</groupId>
         <artifactId>TLS-Attacker</artifactId>
-        <version>2.0Beta2</version>
+        <version>2.0Beta4</version>
     </parent>
     <artifactId>Attacks</artifactId>
     <packaging>jar</packaging>

Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/Main.java

@@ -11,26 +11,28 @@
 import com.beust.jcommander.JCommander;
 import de.rub.nds.tlsattacker.attacks.config.BleichenbacherCommandConfig;
 import de.rub.nds.tlsattacker.attacks.config.Cve20162107CommandConfig;
-import de.rub.nds.tlsattacker.attacks.config.DtlsPaddingOracleAttackCommandConfig;
 import de.rub.nds.tlsattacker.attacks.config.EarlyCCSCommandConfig;
 import de.rub.nds.tlsattacker.attacks.config.HeartbleedCommandConfig;
 import de.rub.nds.tlsattacker.attacks.config.InvalidCurveAttackConfig;
 import de.rub.nds.tlsattacker.attacks.config.Lucky13CommandConfig;
 import de.rub.nds.tlsattacker.attacks.config.PaddingOracleCommandConfig;
 import de.rub.nds.tlsattacker.attacks.config.PoodleCommandConfig;
+import de.rub.nds.tlsattacker.attacks.config.SimpleMitmProxyCommandConfig;
 import de.rub.nds.tlsattacker.attacks.config.TLSPoodleCommandConfig;
+import de.rub.nds.tlsattacker.attacks.config.TokenBindingMitmCommandConfig;
 import de.rub.nds.tlsattacker.attacks.config.WinshockCommandConfig;
 import de.rub.nds.tlsattacker.attacks.impl.Attacker;
 import de.rub.nds.tlsattacker.attacks.impl.BleichenbacherAttacker;
 import de.rub.nds.tlsattacker.attacks.impl.Cve20162107Attacker;
-import de.rub.nds.tlsattacker.attacks.impl.DtlsPaddingOracleAttacker;
 import de.rub.nds.tlsattacker.attacks.impl.EarlyCCSAttacker;
 import de.rub.nds.tlsattacker.attacks.impl.HeartbleedAttacker;
 import de.rub.nds.tlsattacker.attacks.impl.InvalidCurveAttacker;
 import de.rub.nds.tlsattacker.attacks.impl.Lucky13Attacker;
 import de.rub.nds.tlsattacker.attacks.impl.PaddingOracleAttacker;
 import de.rub.nds.tlsattacker.attacks.impl.PoodleAttacker;
+import de.rub.nds.tlsattacker.attacks.impl.SimpleMitmProxy;
 import de.rub.nds.tlsattacker.attacks.impl.TLSPoodleAttacker;
+import de.rub.nds.tlsattacker.attacks.impl.TokenBindingMitm;
 import de.rub.nds.tlsattacker.attacks.impl.WinshockAttacker;
 import de.rub.nds.tlsattacker.core.config.TLSDelegateConfig;
 import de.rub.nds.tlsattacker.core.config.delegate.GeneralDelegate;
@@ -44,22 +46,25 @@
  */
 public class Main {
 
-    private static Logger LOGGER = LogManager.getLogger("Attacks");
+    private static Logger LOGGER = LogManager.getLogger(Main.class.getName());
 
     public static void main(String[] args) {
         GeneralDelegate generalDelegate = new GeneralDelegate();
         JCommander jc = new JCommander(generalDelegate);
         BleichenbacherCommandConfig bleichenbacherTest = new BleichenbacherCommandConfig(generalDelegate);
         jc.addCommand(BleichenbacherCommandConfig.ATTACK_COMMAND, bleichenbacherTest);
-        DtlsPaddingOracleAttackCommandConfig dtlsPaddingOracleAttackTest = new DtlsPaddingOracleAttackCommandConfig(
-                generalDelegate);
-        jc.addCommand(DtlsPaddingOracleAttackCommandConfig.ATTACK_COMMAND, dtlsPaddingOracleAttackTest);
+        // DtlsPaddingOracleAttackCommandConfig dtlsPaddingOracleAttackTest =
+        // new DtlsPaddingOracleAttackCommandConfig(
+        // generalDelegate);
+        // jc.addCommand(DtlsPaddingOracleAttackCommandConfig.ATTACK_COMMAND,
+        // dtlsPaddingOracleAttackTest);
         InvalidCurveAttackConfig ellipticTest = new InvalidCurveAttackConfig(generalDelegate);
         jc.addCommand(InvalidCurveAttackConfig.ATTACK_COMMAND, ellipticTest);
         HeartbleedCommandConfig heartbleed = new HeartbleedCommandConfig(generalDelegate);
         jc.addCommand(HeartbleedCommandConfig.ATTACK_COMMAND, heartbleed);
-        Lucky13CommandConfig lucky13 = new Lucky13CommandConfig(generalDelegate);
-        jc.addCommand(Lucky13CommandConfig.ATTACK_COMMAND, lucky13);
+        // Lucky13CommandConfig lucky13 = new
+        // Lucky13CommandConfig(generalDelegate);
+        // jc.addCommand(Lucky13CommandConfig.ATTACK_COMMAND, lucky13);
         PaddingOracleCommandConfig paddingOracle = new PaddingOracleCommandConfig(generalDelegate);
         jc.addCommand(PaddingOracleCommandConfig.ATTACK_COMMAND, paddingOracle);
         TLSPoodleCommandConfig tlsPoodle = new TLSPoodleCommandConfig(generalDelegate);
@@ -72,6 +77,12 @@ public static void main(String[] args) {
         jc.addCommand(EarlyCCSCommandConfig.ATTACK_COMMAND, earlyCCS);
         PoodleCommandConfig poodle = new PoodleCommandConfig(generalDelegate);
         jc.addCommand(PoodleCommandConfig.ATTACK_COMMAND, poodle);
+        SimpleMitmProxyCommandConfig simpleMitmProxy = new SimpleMitmProxyCommandConfig(generalDelegate);
+        jc.addCommand(SimpleMitmProxyCommandConfig.ATTACK_COMMAND, simpleMitmProxy);
+        // TokenBindingMitmCommandConfig tokenBindingMitm = new
+        // TokenBindingMitmCommandConfig(generalDelegate);
+        // jc.addCommand(TokenBindingMitmCommandConfig.ATTACK_COMMAND,
+        // tokenBindingMitm);
         jc.parse(args);
         if (generalDelegate.isHelp() || jc.getParsedCommand() == null) {
             if (jc.getParsedCommand() == null) {
@@ -92,9 +103,9 @@ public static void main(String[] args) {
             case HeartbleedCommandConfig.ATTACK_COMMAND:
                 attacker = new HeartbleedAttacker(heartbleed);
                 break;
-            case Lucky13CommandConfig.ATTACK_COMMAND:
-                attacker = new Lucky13Attacker(lucky13);
-                break;
+            // case Lucky13CommandConfig.ATTACK_COMMAND:
+            // attacker = new Lucky13Attacker(lucky13);
+            // break;
             case TLSPoodleCommandConfig.ATTACK_COMMAND:
                 attacker = new TLSPoodleAttacker(tlsPoodle);
                 break;
@@ -107,17 +118,24 @@ public static void main(String[] args) {
             case WinshockCommandConfig.ATTACK_COMMAND:
                 attacker = new WinshockAttacker(winshock);
                 break;
-            case DtlsPaddingOracleAttackCommandConfig.ATTACK_COMMAND:
-                attacker = new DtlsPaddingOracleAttacker(dtlsPaddingOracleAttackTest);
-                break;
+            // case DtlsPaddingOracleAttackCommandConfig.ATTACK_COMMAND:
+            // attacker = new
+            // DtlsPaddingOracleAttacker(dtlsPaddingOracleAttackTest);
+            // break;
             case EarlyCCSCommandConfig.ATTACK_COMMAND:
                 attacker = new EarlyCCSAttacker(earlyCCS);
                 break;
             case PoodleCommandConfig.ATTACK_COMMAND:
                 attacker = new PoodleAttacker(poodle);
                 break;
+            case SimpleMitmProxyCommandConfig.ATTACK_COMMAND:
+                attacker = new SimpleMitmProxy(simpleMitmProxy);
+                break;
+            // case TokenBindingMitmCommandConfig.ATTACK_COMMAND:
+            // attacker = new TokenBindingMitm(tokenBindingMitm);
+            // break;
             default:
-                throw new ConfigurationException("No command found");
+                throw new ConfigurationException("Command not found");
         }
         if (attacker == null) {
             throw new ConfigurationException("Attacker not found");
@@ -133,7 +151,7 @@ public static void main(String[] args) {
                     Boolean result = attacker.isVulnerable();
                     LOGGER.info("Vulnerable:" + (result == null ? "Uncertain" : result.toString()));
                 } catch (UnsupportedOperationException E) {
-                    LOGGER.info("The selection is currently not implemented");
+                    LOGGER.info("The selected attacker is currently not implemented");
                 }
             }
         }

Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/config/AttackConfig.java

@@ -8,28 +8,18 @@
  */
 package de.rub.nds.tlsattacker.attacks.config;
 
-import com.beust.jcommander.Parameter;
 import de.rub.nds.tlsattacker.core.config.TLSDelegateConfig;
 import de.rub.nds.tlsattacker.core.config.delegate.GeneralDelegate;
 
 /**
  *
  * @author robert
  */
-public class AttackConfig extends TLSDelegateConfig {
-
-    @Parameter(names = "-executeAttack", description = "If this value is set the Attack is not only Tested, but also executed (WARNING)")
-    private boolean executeAttack = false;
+public abstract class AttackConfig extends TLSDelegateConfig {
 
     public AttackConfig(GeneralDelegate delegate) {
         super(delegate);
     }
 
-    public boolean isExecuteAttack() {
-        return executeAttack;
-    }
-
-    public void setExecuteAttack(boolean executeAttack) {
-        this.executeAttack = executeAttack;
-    }
+    public abstract boolean isExecuteAttack();
 }

Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/config/BleichenbacherCommandConfig.java

@@ -10,16 +10,18 @@
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.ParametersDelegate;
-import de.rub.nds.tlsattacker.core.config.TLSDelegateConfig;
+import de.rub.nds.tlsattacker.attacks.config.delegate.AttackDelegate;
+import de.rub.nds.tlsattacker.core.config.Config;
 import de.rub.nds.tlsattacker.core.config.delegate.CiphersuiteDelegate;
 import de.rub.nds.tlsattacker.core.config.delegate.ClientDelegate;
 import de.rub.nds.tlsattacker.core.config.delegate.GeneralDelegate;
 import de.rub.nds.tlsattacker.core.config.delegate.HostnameExtensionDelegate;
 import de.rub.nds.tlsattacker.core.config.delegate.ProtocolVersionDelegate;
 import de.rub.nds.tlsattacker.core.constants.CipherSuite;
-import de.rub.nds.tlsattacker.core.workflow.TlsConfig;
 import java.util.LinkedList;
 import java.util.List;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.core.config.Configurator;
 
 /**
  *
@@ -30,27 +32,47 @@ public class BleichenbacherCommandConfig extends AttackConfig {
     public static final String ATTACK_COMMAND = "bleichenbacher";
 
     @ParametersDelegate
-    private final ClientDelegate clientDelegate;
+    private ClientDelegate clientDelegate;
     @ParametersDelegate
-    private final HostnameExtensionDelegate hostnameExtensionDelegate;
+    private HostnameExtensionDelegate hostnameExtensionDelegate;
     @ParametersDelegate
-    private final CiphersuiteDelegate ciphersuiteDelegate;
+    private CiphersuiteDelegate ciphersuiteDelegate;
     @ParametersDelegate
-    private final ProtocolVersionDelegate protocolVersionDelegate;
-
-    @Parameter(names = "-type", description = "Type of the Bleichenbacher Test results in a different number of server test quries (FAST/FULL)")
+    private ProtocolVersionDelegate protocolVersionDelegate;
+    @ParametersDelegate
+    private AttackDelegate attackDelegate;
+    @Parameter(names = "-valid_response", description = "Bleichenbacher oracle responds with true if the last server "
+            + "message contains this string")
+    private String validResponseContent;
+    @Parameter(names = "-invalid_response", description = "Bleichenbacher oracle responds with false if the last server "
+            + "message contains this string")
+    private String invalidResponseContent;
+    @Parameter(names = "-encrypted_premaster_secret", description = "Encrypted premaster secret from the RSA client key "
+            + "exchange message. You can retrieve this message from the Wireshark traffic. Find the client key exchange "
+            + "message, right click on the \"EncryptedPremaster\" value and copy this value as a Hex Stream.")
+    private String encryptedPremasterSecret;
+    @Parameter(names = "-type", description = "Type of the Bleichenbacher Test results in a different number of server test quries")
     private Type type = Type.FAST;
+    @Parameter(names = "-msgPkcsConform", description = "Used by the real Bleichenbacher attack. Indicates whether the original "
+            + "message that we are going to decrypt is PKCS#1 conform or not (more precisely, whether it starts with 0x00 0x02.")
+    private boolean msgPkcsConform = true;
 
     public BleichenbacherCommandConfig(GeneralDelegate delegate) {
         super(delegate);
         clientDelegate = new ClientDelegate();
         hostnameExtensionDelegate = new HostnameExtensionDelegate();
         ciphersuiteDelegate = new CiphersuiteDelegate();
         protocolVersionDelegate = new ProtocolVersionDelegate();
+        attackDelegate = new AttackDelegate();
         addDelegate(clientDelegate);
         addDelegate(hostnameExtensionDelegate);
         addDelegate(ciphersuiteDelegate);
         addDelegate(protocolVersionDelegate);
+        addDelegate(attackDelegate);
+
+        if (delegate.getLogLevel() != Level.ALL && delegate.getLogLevel() != Level.TRACE) {
+            Configurator.setAllLevels("de.rub.nds.tlsattacker.core", Level.ERROR);
+        }
     }
 
     public Type getType() {
@@ -62,8 +84,8 @@ public void setType(Type type) {
     }
 
     @Override
-    public TlsConfig createConfig() {
-        TlsConfig config = super.createConfig();
+    public Config createConfig() {
+        Config config = super.createConfig();
         if (ciphersuiteDelegate.getCipherSuites() == null) {
             List<CipherSuite> cipherSuites = new LinkedList<>();
             cipherSuites.add(CipherSuite.TLS_RSA_WITH_AES_128_CBC_SHA);
@@ -73,14 +95,38 @@ public TlsConfig createConfig() {
             cipherSuites.add(CipherSuite.TLS_RSA_WITH_AES_256_CBC_SHA256);
             cipherSuites.add(CipherSuite.TLS_RSA_WITH_RC4_128_MD5);
             cipherSuites.add(CipherSuite.TLS_RSA_WITH_RC4_128_SHA);
-            config.setSupportedCiphersuites(cipherSuites);
+            config.setDefaultClientSupportedCiphersuites(cipherSuites);
         }
+        config.setQuickReceive(true);
+        config.setEarlyStop(true);
         return config;
     }
 
+    @Override
+    public boolean isExecuteAttack() {
+        return attackDelegate.isExecuteAttack();
+    }
+
+    public String getValidResponseContent() {
+        return validResponseContent;
+    }
+
+    public String getInvalidResponseContent() {
+        return invalidResponseContent;
+    }
+
+    public String getEncryptedPremasterSecret() {
+        return encryptedPremasterSecret;
+    }
+
+    public boolean isMsgPkcsConform() {
+        return msgPkcsConform;
+    }
+
     public enum Type {
 
         FULL,
         FAST
     }
+
 }

Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/config/Cve20162107CommandConfig.java

@@ -10,14 +10,14 @@
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.ParametersDelegate;
+import de.rub.nds.tlsattacker.core.config.Config;
 import de.rub.nds.tlsattacker.core.config.delegate.CiphersuiteDelegate;
 import de.rub.nds.tlsattacker.core.config.delegate.ClientDelegate;
 import de.rub.nds.tlsattacker.core.config.delegate.GeneralDelegate;
 import de.rub.nds.tlsattacker.core.config.delegate.HostnameExtensionDelegate;
 import de.rub.nds.tlsattacker.core.constants.CipherSuite;
 import de.rub.nds.tlsattacker.core.constants.ProtocolVersion;
 import de.rub.nds.tlsattacker.core.exceptions.ConfigurationException;
-import de.rub.nds.tlsattacker.core.workflow.TlsConfig;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
@@ -33,11 +33,11 @@ public class Cve20162107CommandConfig extends AttackConfig {
     private List<ProtocolVersion> versions;
 
     @ParametersDelegate
-    private final ClientDelegate clientDelegate;
+    private ClientDelegate clientDelegate;
     @ParametersDelegate
-    private final CiphersuiteDelegate cipherSuiteDelegate;
+    private CiphersuiteDelegate cipherSuiteDelegate;
     @ParametersDelegate
-    private final HostnameExtensionDelegate hostnameExtensionDelegate;
+    private HostnameExtensionDelegate hostnameExtensionDelegate;
 
     public Cve20162107CommandConfig(GeneralDelegate delegate) {
         super(delegate);
@@ -63,18 +63,23 @@ public void setVersions(List<ProtocolVersion> versions) {
     }
 
     @Override
-    public TlsConfig createConfig() {
-        TlsConfig config = super.createConfig();
+    public boolean isExecuteAttack() {
+        return false;
+    }
+
+    @Override
+    public Config createConfig() {
+        Config config = super.createConfig();
         if (cipherSuiteDelegate.getCipherSuites() == null) {
             List<CipherSuite> cipherSuites = new LinkedList<>();
             cipherSuites.add(CipherSuite.TLS_RSA_WITH_AES_128_CBC_SHA);
             cipherSuites.add(CipherSuite.TLS_RSA_WITH_3DES_EDE_CBC_SHA);
             cipherSuites.add(CipherSuite.TLS_RSA_WITH_AES_128_CBC_SHA256);
             cipherSuites.add(CipherSuite.TLS_RSA_WITH_AES_256_CBC_SHA);
             cipherSuites.add(CipherSuite.TLS_RSA_WITH_AES_256_CBC_SHA256);
-            config.setSupportedCiphersuites(cipherSuites);
+            config.setDefaultClientSupportedCiphersuites(cipherSuites);
         }
-        for (CipherSuite suite : config.getSupportedCiphersuites()) {
+        for (CipherSuite suite : config.getDefaultClientSupportedCiphersuites()) {
             if (!suite.isCBC()) {
                 throw new ConfigurationException("This attack only works with CBC Ciphersuites");
             }