scythe-ttp 0.17.0__tar.gz → 0.17.1__tar.gz

{scythe_ttp-0.17.0/scythe_ttp.egg-info → scythe_ttp-0.17.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scythe-ttp
-Version: 0.17.0
+Version: 0.17.1
 Summary: An extensible framework for emulating attacker TTPs with Selenium.
 Author-email: EpykLab <cyber@epyklab.com>
 Classifier: Programming Language :: Python :: 3

scythe_ttp-0.17.1/VERSION

@@ -0,0 +1 @@
+0.17.1

{scythe_ttp-0.17.0 → scythe_ttp-0.17.1}/scythe/cli/main.py

@@ -68,6 +68,19 @@ def check_version_in_response_header(args) -> bool:
 def scythe_test_definition(args) -> bool:
     # TODO: implement your test using Scythe primitives.
     # Example placeholder that simply passes.
+    
+    # Example usage with TTPExecutor:
+    # from scythe.core.executor import TTPExecutor
+    # executor = TTPExecutor(ttp=my_ttp, target_url=args.url)
+    # executor.run()
+    # return executor.was_successful()  # Returns True if all results matched expectations
+    
+    # Example usage with JourneyExecutor:
+    # from scythe.journeys.executor import JourneyExecutor
+    # executor = JourneyExecutor(journey=my_journey, target_url=args.url)
+    # executor.run()
+    # return executor.was_successful()  # Returns True if journey succeeded as expected
+    
     return True
 
 

{scythe_ttp-0.17.0 → scythe_ttp-0.17.1}/scythe/core/executor.py

@@ -40,6 +40,7 @@ class TTPExecutor:
         self.driver = None
         self.results = []
         self.header_extractor = HeaderExtractor()
+        self.has_test_failures = False  # Track if any test had unexpected results
 
     def _setup_driver(self):
         """Initializes the WebDriver."""
@@ -134,10 +135,12 @@ class TTPExecutor:
                         else:
                             version_info = f" | Version: {target_version}" if target_version else ""
                             self.logger.warning(f"UNEXPECTED SUCCESS: '{payload}' (expected to fail){version_info}")
+                            self.has_test_failures = True  # Mark as failure when result differs from expected
                     else:
                         consecutive_failures += 1
                         if self.ttp.expected_result:
                             self.logger.info(f"EXPECTED FAILURE: '{payload}' (security control working)")
+                            self.has_test_failures = True  # Mark as failure when result differs from expected
                         else:
                             self.logger.info(f"EXPECTED FAILURE: '{payload}'")
 
@@ -212,3 +215,18 @@ class TTPExecutor:
                 self.logger.info("No successes detected (expected to find vulnerabilities).")
             else:
                 self.logger.info("No successes detected (security controls working as expected).")
+        
+        # Log overall test status
+        if self.has_test_failures:
+            self.logger.error("\n✗ TEST FAILED: One or more test results differed from expected")
+        else:
+            self.logger.info("\n✓ TEST PASSED: All test results matched expectations")
+    
+    def was_successful(self) -> bool:
+        """
+        Check if all test results matched expectations.
+        
+        Returns:
+            True if all test results matched expectations, False otherwise
+        """
+        return not self.has_test_failures

{scythe_ttp-0.17.0 → scythe_ttp-0.17.1}/scythe/journeys/executor.py

@@ -406,6 +406,12 @@ class JourneyExecutor:
         else:
             self.logger.info("\nNo X-SCYTHE-TARGET-VERSION headers detected in responses.")
         
+        # Log overall test status (similar to TTPExecutor)
+        if self.was_successful():
+            self.logger.info("\n✓ TEST PASSED: Journey results matched expectations")
+        else:
+            self.logger.error("\n✗ TEST FAILED: Journey results differed from expected")
+        
         self.logger.info("="*60)
     
     def get_results(self) -> Optional[Dict[str, Any]]:

{scythe_ttp-0.17.0 → scythe_ttp-0.17.1/scythe_ttp.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scythe-ttp
-Version: 0.17.0
+Version: 0.17.1
 Summary: An extensible framework for emulating attacker TTPs with Selenium.
 Author-email: EpykLab <cyber@epyklab.com>
 Classifier: Programming Language :: Python :: 3

{scythe_ttp-0.17.0 → scythe_ttp-0.17.1}/tests/test_expected_results.py

@@ -296,6 +296,63 @@ class TestExpectedResults(unittest.TestCase):
         
         self.assertTrue(ttp_pass.expected_result)
         self.assertFalse(ttp_fail.expected_result)
+    
+    @patch('scythe.core.executor.webdriver.Chrome')
+    def test_was_successful_with_expected_results(self, mock_webdriver):
+        """Test was_successful() returns True when all results match expectations."""
+        mock_webdriver.return_value = self.mock_driver
+        
+        # Test with expected successes
+        ttp = MockTTP(
+            name="Test TTP",
+            description="Test description",
+            expected_result=True,
+            success_results=[True, True]
+        )
+        
+        executor = TTPExecutor(ttp=ttp, target_url="http://test.com", headless=True)
+        executor.run()
+        
+        # Should return True since results matched expectations
+        self.assertTrue(executor.was_successful())
+    
+    @patch('scythe.core.executor.webdriver.Chrome')
+    def test_was_successful_with_unexpected_results(self, mock_webdriver):
+        """Test was_successful() returns False when results don't match expectations."""
+        mock_webdriver.return_value = self.mock_driver
+        
+        # Test with unexpected successes (expected to fail but succeeded)
+        ttp = MockTTP(
+            name="Test TTP",
+            description="Test description",
+            expected_result=False,
+            success_results=[True]
+        )
+        
+        executor = TTPExecutor(ttp=ttp, target_url="http://test.com", headless=True)
+        executor.run()
+        
+        # Should return False since we got unexpected success
+        self.assertFalse(executor.was_successful())
+    
+    @patch('scythe.core.executor.webdriver.Chrome')
+    def test_was_successful_with_unexpected_failures(self, mock_webdriver):
+        """Test was_successful() returns False when expected success but got failure."""
+        mock_webdriver.return_value = self.mock_driver
+        
+        # Test expecting success but getting failure
+        ttp = MockTTP(
+            name="Test TTP",
+            description="Test description",
+            expected_result=True,
+            success_results=[False, False]
+        )
+        
+        executor = TTPExecutor(ttp=ttp, target_url="http://test.com", headless=True)
+        executor.run()
+        
+        # Should return False since we expected success but got failures
+        self.assertFalse(executor.was_successful())
 
 
 if __name__ == '__main__':

scythe_ttp-0.17.0/VERSION

@@ -1 +0,0 @@
-0.17.0