Merge branch 'dev' into 1152-implement-fetching-sparse-fieldsets

Author: Eric-Wasson

Dockerfile

@@ -6,7 +6,7 @@ RUN cd / && git rev-parse --short HEAD > /HEAD; exit 0
 
 # BASE image
 # ----BEGIN----
-FROM php:8-apache AS hashtopolis-server-base
+FROM php:8.4-apache AS hashtopolis-server-base
 
 # Enable possible build args for injecting user commands
 ARG CONTAINER_USER_CMD_PRE
@@ -104,7 +104,7 @@ ENTRYPOINT [ "docker-entrypoint.sh" ]
 FROM hashtopolis-server-base AS hashtopolis-server-dev
 
 # Setting up development requirements, install xdebug
-RUN yes | pecl install xdebug-3.4.0beta1 && docker-php-ext-enable xdebug \
+RUN yes | pecl install xdebug && docker-php-ext-enable xdebug \
     && echo "zend_extension=$(find /usr/local/lib/php/extensions/ -name xdebug.so)" > /usr/local/etc/php/conf.d/xdebug.ini \
     && echo "xdebug.mode = debug" >> /usr/local/etc/php/conf.d/xdebug.ini \
     && echo "xdebug.start_with_request = yes" >> /usr/local/etc/php/conf.d/xdebug.ini \

ci/apiv2/hashtopolis.py

@@ -4,6 +4,7 @@
 # PoC testing/development framework for APIv2
 # Written in python to work on creation of hashtopolis APIv2 python binding.
 #
+import base64
 from base64 import b64encode
 import copy
 import json
@@ -51,9 +52,9 @@ def __init__(self, *args, **kwargs):
 class HashtopolisConfig(object):
     def __init__(self):
         # Request access TOKEN, used throughout the test
-        load_order = (str(Path(__file__).parent.joinpath('{name}-defaults.{extension}')),) \
+        load_order = (str(Path(__file__).parent.joinpath('{name}-defaults{suffix}')),) \
                      + confidence.DEFAULT_LOAD_ORDER
-        self._cfg = confidence.load_name('hashtopolis-test', load_order=load_order)
+        self._cfg = confidence.load_name('hashtopolis-test', load_order=load_order, format=confidence.YAML())
         self._hashtopolis_uri = self._cfg['hashtopolis_uri']
         self._api_endpoint = self._hashtopolis_uri + '/api/v2'
         self.username = self._cfg['username']
@@ -1022,10 +1023,10 @@ def export_wordlist(self, hashlist):
         response = self._helper_request("exportWordlist", payload)
         return File(**response['data'])
 
-    def import_cracked_hashes(self, hashlist, source_data, separator):
+    def import_cracked_hashes(self, hashlist, source_data: str, separator):
         payload = {
             'hashlistId': hashlist.id,
-            'sourceData': source_data,
+            'sourceData': base64.b64encode(source_data.encode()).decode(),
             'separator': separator,
         }
         response = self._helper_request("importCrackedHashes", payload)

ci/apiv2/hashtopolis_agent.py

@@ -46,9 +46,9 @@ class ProcessState(enum.IntEnum):
 class HashtopolisConfig(object):
     def __init__(self):
         # Request access TOKEN, used throughout the test
-        load_order = (str(Path(__file__).parent.joinpath('{name}-defaults.{extension}')),) \
+        load_order = (str(Path(__file__).parent.joinpath('{name}-defaults{suffix}')),) \
                      + confidence.DEFAULT_LOAD_ORDER
-        self._cfg = confidence.load_name('hashtopolis-test', load_order=load_order)
+        self._cfg = confidence.load_name('hashtopolis-test', load_order=load_order, format=confidence.YAML())
         self._hashtopolis_uri = self._cfg['hashtopolis_uri']
         self._api_endpoint = self._hashtopolis_uri + '/api/v2'
         self.username = self._cfg['username']
@@ -60,9 +60,9 @@ class DummyAgent(object):
     # State: Early Alpha
     def __init__(self, token=None, voucher=None):
         # Request access TOKEN, used throughout the test
-        load_order = (str(Path(__file__).parent.joinpath('{name}-defaults.{extension}')),) \
+        load_order = (str(Path(__file__).parent.joinpath('{name}-defaults{suffix}')),) \
                      + confidence.DEFAULT_LOAD_ORDER
-        self._cfg = confidence.load_name('hashtopolis-test', load_order=load_order)
+        self._cfg = confidence.load_name('hashtopolis-test', load_order=load_order, format=confidence.YAML())
         self._hashtopolis_uri = self._cfg['hashtopolis_uri']
         self._api_endpoint = self._hashtopolis_uri + '/api/server.php'
 

ci/apiv2/requirements.txt

@@ -1,5 +1,5 @@
 click
 click_log
-confidence
+confidence==0.17
 pytest
 tuspy

ci/tests/integration/MaxAgentsTest.class.php

@@ -126,7 +126,7 @@ private function testTaskMaxAgents($hashlistId) {
       "action" => "getChunk",
       "taskId" => $task1Id,
       "token" => $agent2["token"]]);
-    if ($response["response"] !== "ERROR" || $response["message"] != "Task already saturated by other agents, no other task available!") {
+    if ($response["response"] !== "ERROR" || $response["message"] != "You are not assigned to this task!") {
       $this->testFailed("MaxAgentsTest:testTaskMaxAgents()", sprintf("Expected getChunk to fail, instead got: %s", implode(", ", $response)));
       return;
     }
@@ -607,4 +607,4 @@ public function getTestName() {
   }
 }
 
-HashtopolisTestFramework::register(new  MaxAgentsTest());
+HashtopolisTestFramework::register(new  MaxAgentsTest());

composer.json

@@ -17,19 +17,19 @@
         }
     ],
     "require": {
-        "php": "^8.0",
+        "php": "^8.2",
         "ext-json": "*",
         "ext-pdo": "*",
+        "composer/semver": "^3.4",
         "crell/api-problem": "^3.6",
+        "jimtools/jwt-auth": "^2.3",
         "middlewares/encoder": "^2.1",
         "middlewares/negotiation": "^2.1",
         "monolog/monolog": "^2.8",
         "php-di/php-di": "7.0.7",
         "slim/psr7": "^1.5",
         "slim/slim": "^4.10",
-        "tuupola/slim-basic-auth": "^3.3",
-        "tuupola/slim-jwt-auth": "^3.6",
-        "composer/semver": "^3.4"
+        "tuupola/slim-basic-auth": "^3.3"
     },
     "require-dev": {
         "jangregor/phpstan-prophecy": "^1.0.0",
@@ -44,7 +44,10 @@
             "phpstan/extension-installer": true
         },
         "process-timeout": 0,
-        "sort-packages": true
+        "sort-packages": true,
+        "audit": {
+          "block-insecure": false
+        }
     },
     "autoload": {
         "psr-4": {