Merge pull request #18 from qtc-de/develop

Prepare v4.0.0 Release
qtc-de · Dec 5, 2021 · 0e5a68c · 0e5a68c
2 parents 18b9fec + b562adf
commit 0e5a68c
Show file tree

Hide file tree

Showing 167 changed files with 13,114 additions and 4,226 deletions.
diff --git a/.github/workflows/develop-server.yml → .github/workflows/develop-example-server.yml b/.github/workflows/develop-server.yml → .github/workflows/develop-example-server.yml
@@ -4,9 +4,13 @@ on:
   push:
     branches:
       - develop
+    paths:
+      - 'docker/example-server/**'
   pull_request:
     branches:
       - develop
+    paths:
+      - 'docker/example-server/**'
 
 jobs:
   build:
@@ -27,4 +31,4 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-maven-
     - name: Build with Maven
-      run: cd .docker/resources/example-server && mvn -B package --file pom.xml
+      run: cd docker/example-server/resources/server && mvn -B package --file pom.xml
diff --git a/.github/workflows/develop-ssrf-server.yml b/.github/workflows/develop-ssrf-server.yml
@@ -0,0 +1,34 @@
+name: ssrf server - develop
+
+on:
+  push:
+    branches:
+      - develop
+    paths:
+      - 'docker/ssrf-server/**'
+  pull_request:
+    branches:
+      - develop
+    paths:
+      - 'docker/ssrf-server/**'
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Cache local Maven repository
+      uses: actions/cache@v2
+      with:
+        path: ~/.m2/repository
+        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+        restore-keys: |
+          ${{ runner.os }}-maven-
+    - name: Build with Maven
+      run: cd docker/ssrf-server/resources/server && mvn -B package --file pom.xml
diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
@@ -4,27 +4,43 @@ on:
   push:
     branches:
       - develop
+    paths:
+      - 'src/**'
+      - 'pom.xml'
   pull_request:
     branches:
       - develop
+    paths:
+      - 'src/**'
+      - 'pom.xml'
 
 jobs:
   build:
 
     runs-on: ubuntu-latest
 
     steps:
+
     - uses: actions/checkout@v2
+
     - name: Set up JDK 1.8
       uses: actions/setup-java@v1
       with:
         java-version: 1.8
+
     - name: Cache local Maven repository
       uses: actions/cache@v2
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
         restore-keys: |
           ${{ runner.os }}-maven-
+
     - name: Build with Maven
       run: mvn -B package --file pom.xml
+
+    - name: Archive generated JAR file
+      uses: actions/upload-artifact@v2
+      with:
+        name: rmg-develop-artifact
+        path: target/rmg-*
diff --git a/.github/workflows/feat.yml b/.github/workflows/feat.yml
@@ -0,0 +1,34 @@
+name: develop maven CI
+
+on:
+  push:
+    branches:
+      - 'feat/**'
+    paths:
+      - 'src/**'
+      - 'pom.xml'
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+
+    - uses: actions/checkout@v2
+
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+
+    - name: Cache local Maven repository
+      uses: actions/cache@v2
+      with:
+        path: ~/.m2/repository
+        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+        restore-keys: |
+          ${{ runner.os }}-maven-
+
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml
diff --git a/.github/workflows/master-server.yml → .github/workflows/master-example-server.yml b/.github/workflows/master-server.yml → .github/workflows/master-example-server.yml
@@ -4,9 +4,13 @@ on:
   push:
     branches:
       - master
+    paths:
+      - 'docker/example-server/**'
   pull_request:
     branches:
       - master
+    paths:
+      - 'docker/example-server/**'
 
 jobs:
   build:
@@ -27,4 +31,4 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-maven-
     - name: Build with Maven
-      run: cd .docker/resources/example-server && mvn -B package --file pom.xml
+      run: cd docker/example-server/resources/server && mvn -B package --file pom.xml
diff --git a/.github/workflows/master-ssrf-server.yml b/.github/workflows/master-ssrf-server.yml
@@ -0,0 +1,34 @@
+name: ssrf server - master
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - 'docker/ssrf-server/**'
+  pull_request:
+    branches:
+      - master
+    paths:
+      - 'docker/ssrf-server/**'
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Cache local Maven repository
+      uses: actions/cache@v2
+      with:
+        path: ~/.m2/repository
+        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+        restore-keys: |
+          ${{ runner.os }}-maven-
+    - name: Build with Maven
+      run: cd docker/ssrf-server/resources/server && mvn -B package --file pom.xml
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -4,27 +4,43 @@ on:
   push:
     branches:
       - master
+    paths:
+      - 'src/**'
+      - 'pom.xml'
   pull_request:
     branches:
       - master
+    paths:
+      - 'src/**'
+      - 'pom.xml'
 
 jobs:
   build:
 
     runs-on: ubuntu-latest
 
     steps:
+
     - uses: actions/checkout@v2
+
     - name: Set up JDK 1.8
       uses: actions/setup-java@v1
       with:
         java-version: 1.8
+
     - name: Cache local Maven repository
       uses: actions/cache@v2
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
         restore-keys: |
           ${{ runner.os }}-maven-
+
     - name: Build with Maven
       run: mvn -B package --file pom.xml
+
+    - name: Archive generated JAR file
+      uses: actions/upload-artifact@v2
+      with:
+        name: rmg-master-artifact
+        path: target/rmg-*
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,36 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
+## [4.0.0] - Dec 05, 2021
+
+### Added
+
+* Added the ``scan`` action, that performs a simple portscan for *RMI* services.
+* Added the ``roguejmx`` action, that spawns a rogue *JMX* listener.
+* Added the ``objid`` action, that inspects ``ObjID`` values.
+* Added the ``known`` action, that lists information about known *RMI* classes.
+* Added [SSRF support](/docs/rmg/actions.md#ssrf-support) in form of the ``--ssrf``
+  and ``--ssrf-response`` options.
+* Added an [SSRF example server](/docker/ssrf-server) (docker container).
+* Added the ``--scan-action`` option that can be used during the ``enum`` action
+  to perform only the specified enumeration.
+* Added support for custom socket factories within *remote-method-guesser's*
+  [plugin system](/docs/rmg/plugin-system.md).
+* Added a progress bar for the ``guess`` action.
+* Added ``ObjID`` and ``TCPEndpoint`` enumeration during the ``enum`` action.
+
+### Changed
+
+* Changed the argument layout. *remote-method-guesser* now uses a modular argument layout
+  based on [argparse4j](https://github.com/argparse4j/argparse4j).
+* Changed action layout. Previously existing actions like ``method``, ``reg``, ``dgc`` or
+  ``act`` are now bundled into the ``serial`` action.
+* Changed target specification during *codebase attacks*. To target *RMI* default components,
+  you now use the ``--component`` option.
+* Changed codebase enumeration. Now also works for non registry ports.
+* Changed the *DGC enumeration* to *Security Manager* enumeration.
+
+
 ## [3.3.0] - June 20, 2021
 
 ### Added
@@ -29,7 +59,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Some small bug fixes
 
 
-
 ## [3.2.0] - Apr 02, 2021
 
 ### Added