Merge pull request #9 from CompassSecurity/master

Release v2.3.0

Author: Hannah-PortSwigger

BappManifest.bmf

@@ -2,12 +2,12 @@ Uuid: c61cfa893bb14db4b01775554f7b802e
 ExtensionType: 1
 Name: SAML Raider
 RepoName: saml-raider
-ScreenVersion: 2.1.0
-SerialVersion: 19
+ScreenVersion: 2.3.0
+SerialVersion: 20
 MinPlatformVersion: 16
 ProOnly: False
 Author: Roland Bischofberger / Emanuel Duss / Tobias Hort-Giess
 ShortDescription: Provides a SAML message editor and a certificate management tool to help with testing SAML infrastructures.
-EntryPoint: build/libs/saml-raider-2.1.0.jar
+EntryPoint: build/libs/saml-raider-2.3.0.jar
 BuildCommand: ./gradlew jar
 SupportedProducts: Pro, Community

README.md

@@ -79,7 +79,7 @@ Don't forget to rate our extension with as many stars you like :smile:.
 ### Manual Installation
 
 First, download the latest SAML Raider version:
-[saml-raider-2.1.0.jar](https://github.com/SAMLRaider/SAMLRaider/releases/download/v2.1.0/saml-raider-2.1.0.jar).
+[saml-raider-2.3.0.jar](https://github.com/SAMLRaider/SAMLRaider/releases/download/v2.3.0/saml-raider-2.3.0.jar).
 Then, start Burp Suite and click in the `Extensions` tab on `Add`. Choose the
 SAML Raider JAR file to install it and you are ready to go.
 
@@ -149,7 +149,7 @@ SAML Raider is on the Internet :).
 
 ### Other
 
-- SANS Burp Suite Cheat Sheet recommends SAML Raider: https://www.sans.org/security-resources/posters/pen-testing/burp-suite-cheat-sheet-280?msc=Cheat+Sheet+Blog
+- SANS Burp Suite Cheat Sheet recommends SAML Raider: https://www.sans.org/posters/burp-suite-cheat-sheet/
 
 ## Authors
 

build.gradle

@@ -2,7 +2,7 @@ plugins {
 	id "java-library"
 }
 
-version = "2.1.0"
+version = "2.3.0"
 
 repositories {
 	mavenCentral()
@@ -24,6 +24,7 @@ dependencies {
 	implementation libs.org.apache.santuario.xmlsec
 	implementation libs.xerces.xercesimpl
 
+	testImplementation libs.com.formdev.flatlaf
 	testImplementation libs.net.portswigger.burp.extensions.montoya.api
 	testImplementation libs.org.bouncycastle.bcpkix.jdk15on
 	testImplementation libs.org.junit.jupiter

src/main/java/application/CertificateTabController.java

@@ -3,8 +3,17 @@
 import burp.BurpExtender;
 import gui.CertificateTab;
 import helpers.FileHelper;
+import model.BurpCertificate;
+import model.BurpCertificateBuilder;
+import model.BurpCertificateExtension;
+import model.BurpCertificateStore;
+import model.ObjectIdentifier;
+import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
+import org.bouncycastle.openssl.PEMKeyPair;
+import org.bouncycastle.openssl.PEMParser;
+import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter;
+
 import java.awt.Component;
-import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
 import java.io.File;
@@ -13,7 +22,6 @@
 import java.io.IOException;
 import java.security.InvalidKeyException;
 import java.security.KeyFactory;
-import java.security.KeyPair;
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
 import java.security.PrivateKey;
@@ -31,14 +39,6 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Observable;
-import model.BurpCertificate;
-import model.BurpCertificateBuilder;
-import model.BurpCertificateExtension;
-import model.BurpCertificateStore;
-import model.ObjectIdentifier;
-import org.bouncycastle.openssl.PEMKeyPair;
-import org.bouncycastle.openssl.PEMParser;
-import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter;
 
 public class CertificateTabController extends Observable {
 
@@ -186,7 +186,7 @@ private void importExampleCertificates() {
         if (fileHelper.startedFromJar()) {
             try {
                 BurpCertificate c1 = importCertificate(fileHelper.exportRessourceFromJar("examples/certificate.pem"));
-                importPrivateKey(c1, fileHelper.exportRessourceFromJar("examples/private_key_rsa.pem"));
+                importPrivateKeyPemFormat(c1, fileHelper.exportRessourceFromJar("examples/private_key_rsa.pem"));
                 importCertificateChain(fileHelper.exportRessourceFromJar("examples/example.org_chain.pem"));
                 setCertificateDetails(c1);
             } catch (IOException e) {
@@ -196,7 +196,7 @@ private void importExampleCertificates() {
             }
         } else {
             BurpCertificate c1 = importCertificate("src/main/resources/examples/certificate.pem");
-            importPrivateKey(c1, "src/main/resources/examples/private_key_rsa.pem");
+            importPrivateKeyPemFormat(c1, "src/main/resources/examples/private_key_rsa.pem");
             importCertificateChain("src/main/resources/examples/example.org_chain.pem");
             setCertificateDetails(c1);
         }
@@ -311,29 +311,34 @@ public List<BurpCertificate> importCertificateChain(String filename) {
     }
 
     /**
-     * Import a private RSA key in PEM format from a file and add it to the
+     * Import a private key in PEM format from a file and add it to the
      * selected certificate.
      *
      * @param certificate which the private key is for.
-     * @param filename    of the private RSA key in PEM format
+     * @param filename    of the private key in PEM format
      */
-    public void importPrivateKey(BurpCertificate certificate, String filename) {
+    public void importPrivateKeyPemFormat(BurpCertificate certificate, String filename) {
         setStatus("Importing private key...");
-        BufferedReader br;
-        try {
-            br = new BufferedReader(new FileReader(filename));
-            PEMParser pp = new PEMParser(br);
-            PEMKeyPair pemKeyPair = (PEMKeyPair) pp.readObject();
-            KeyPair kp = new JcaPEMKeyConverter().getKeyPair(pemKeyPair);
-            pp.close();
+        try (var pemParser = new PEMParser(new FileReader(filename))) {
+            PrivateKeyInfo privateKeyInfo = null;
+            var object = pemParser.readObject();
+            if (object instanceof PEMKeyPair pemKeyPair) {
+                privateKeyInfo = pemKeyPair.getPrivateKeyInfo();
+            } else if (object instanceof PrivateKeyInfo) {
+                privateKeyInfo = (PrivateKeyInfo) object;
+            }
+            if (privateKeyInfo == null) {
+                setStatus("Error importing private key.");
+                return;
+            }
+            var converter = new JcaPEMKeyConverter();
+            var privateKey = converter.getPrivateKey(privateKeyInfo);
+            certificate.setPrivateKey(privateKey);
             setCertificateTree();
             setStatus("Private Key imported.");
-            certificate.setPrivateKey(kp.getPrivate());
-        } catch (IOException e) {
-            setStatus("Error importing private key. (" + e.getMessage() + ")");
-            BurpExtender.api.logging().logToError(e);
         } catch (Exception e) {
-            setStatus("Error (" + e.getMessage() + ")");
+            setStatus("Error importing private Key. (" + e.getMessage() + ")");
+            BurpExtender.api.logging().logToError(e);
         }
     }
 
@@ -345,7 +350,7 @@ public void importPrivateKey(BurpCertificate certificate, String filename) {
      *                    <code>openssl pkcs8 -topk8 -inform PEM -outform DER -in privatekey.pem -out private_key_pkcs8.pem -nocrypt</code>
      * @param filename    of the PKCS8 key
      */
-    public void importPKCS8(BurpCertificate certificate, String filename) {
+    public void importPrivateKeyPkcs8DerFormat(BurpCertificate certificate, String filename) {
         setStatus("Importing private key...");
         FileInputStream fis;
         File file = new File(filename);
@@ -363,11 +368,9 @@ public void importPKCS8(BurpCertificate certificate, String filename) {
             certificate.setPrivateKey(privateKey);
             setCertificateTree();
             setStatus("Private Key imported.");
-        } catch (IOException | NoSuchAlgorithmException | InvalidKeySpecException e) {
+        } catch (Exception e) {
             setStatus("Error importing private Key. (" + e.getMessage() + ")");
             BurpExtender.api.logging().logToError(e);
-        } catch (Exception e) {
-            setStatus("Error (" + e.getMessage() + ")");
         }
     }
 
@@ -394,12 +397,12 @@ public void exportCertificate(BurpCertificate certificate, String filename) {
     }
 
     /**
-     * Export Private RSA Key in PEM format.
+     * Export private key in PEM format.
      *
      * @param certificate to export
-     * @param filename    for the exported private RSA key
+     * @param filename    for the exported private key
      */
-    public void exportPrivateKey(BurpCertificate certificate, String filename) {
+    public void exportPrivateKeyPemFormat(BurpCertificate certificate, String filename) {
         setStatus("Exporting private key...");
         try {
             fileHelper.exportPEMObject(certificate.getPrivateKey(), filename);

src/main/java/application/SamlMessageDecoder.java

@@ -32,20 +32,23 @@ public static DecodedSAMLMessage getDecodedSAMLMessage(String message, boolean i
         boolean isInflated = true;
         boolean isGZip = true;
 
-       var httpHelpers = new HTTPHelpers();
-
-        try {
-            byte[] inflated = httpHelpers.decompress(base64Decoded, true);
-            return new DecodedSAMLMessage(new String(inflated, StandardCharsets.UTF_8), isInflated, isGZip);
-        } catch (DataFormatException e) {
-            isGZip = false;
-        }
-
-        try {
-            byte[] inflated = httpHelpers.decompress(base64Decoded, false);
-            return new DecodedSAMLMessage(new String(inflated, StandardCharsets.UTF_8), isInflated, isGZip);
-        } catch (DataFormatException e) {
+        if (base64Decoded.length == 0) {
             isInflated = false;
+            isGZip = false;
+        } else {
+            var httpHelpers = new HTTPHelpers();
+            try {
+                byte[] inflated = httpHelpers.decompress(base64Decoded, true);
+                return new DecodedSAMLMessage(new String(inflated, StandardCharsets.UTF_8), isInflated, isGZip);
+            } catch (DataFormatException e) {
+                isGZip = false;
+            }
+            try {
+                byte[] inflated = httpHelpers.decompress(base64Decoded, false);
+                return new DecodedSAMLMessage(new String(inflated, StandardCharsets.UTF_8), isInflated, isGZip);
+            } catch (DataFormatException e) {
+                isInflated = false;
+            }
         }
 
         return new DecodedSAMLMessage(new String(base64Decoded, StandardCharsets.UTF_8), isInflated, isGZip);