methodwebscan 0.20.0__tar.gz → 0.22.0__tar.gz

{methodwebscan-0.20.0 → methodwebscan-0.22.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: methodwebscan
-Version: 0.20.0
+Version: 0.22.0
 Summary: 
 Requires-Python: >=3.8,<4.0
 Classifier: Intended Audience :: Developers

{methodwebscan-0.20.0 → methodwebscan-0.22.0}/pyproject.toml

@@ -4,7 +4,7 @@ dynamic = ["version"]
 
 [tool.poetry]
 name = "methodwebscan"
-version = "v0.20.0"
+version = "v0.22.0"
 description = ""
 readme = "README.md"
 authors = []

{methodwebscan-0.20.0 → methodwebscan-0.22.0}/src/methodwebscan/resources/common/__init__.py

@@ -27,11 +27,16 @@ from .resources import (
     SendHttpRequestConfig,
     TextBody,
     UserAgentPreset,
+    WafBody,
+    WafDetection,
+    WafFingerprint,
+    WafProviderEnum,
     WebProtocol,
     config,
     http,
     method,
     nuclei,
+    waf,
 )
 
 __all__ = [
@@ -59,9 +64,14 @@ __all__ = [
     "SendHttpRequestConfig",
     "TextBody",
     "UserAgentPreset",
+    "WafBody",
+    "WafDetection",
+    "WafFingerprint",
+    "WafProviderEnum",
     "WebProtocol",
     "config",
     "http",
     "method",
     "nuclei",
+    "waf",
 ]

{methodwebscan-0.20.0 → methodwebscan-0.22.0}/src/methodwebscan/resources/common/resources/__init__.py

@@ -2,7 +2,7 @@
 
 # isort: skip_file
 
-from . import config, http, method, nuclei
+from . import config, http, method, nuclei, waf
 from .config import SendHttpRequestConfig
 from .http import (
     BinaryBody,
@@ -32,6 +32,7 @@ from .method import (
     RequestMethod,
     UserAgentPreset,
 )
+from .waf import WafBody, WafDetection, WafFingerprint, WafProviderEnum
 
 __all__ = [
     "BinaryBody",
@@ -58,9 +59,14 @@ __all__ = [
     "SendHttpRequestConfig",
     "TextBody",
     "UserAgentPreset",
+    "WafBody",
+    "WafDetection",
+    "WafFingerprint",
+    "WafProviderEnum",
     "WebProtocol",
     "config",
     "http",
     "method",
     "nuclei",
+    "waf",
 ]

methodwebscan-0.22.0/src/methodwebscan/resources/common/resources/waf/__init__.py

@@ -0,0 +1,10 @@
+# This file was auto-generated by Fern from our API Definition.
+
+# isort: skip_file
+
+from .waf_body import WafBody
+from .waf_detection import WafDetection
+from .waf_fingerprint import WafFingerprint
+from .waf_provider_enum import WafProviderEnum
+
+__all__ = ["WafBody", "WafDetection", "WafFingerprint", "WafProviderEnum"]

{methodwebscan-0.20.0/src/methodwebscan/resources/pentest/resources/waf/resources/detect → methodwebscan-0.22.0/src/methodwebscan/resources/common/resources/waf}/waf_body.py

@@ -3,7 +3,7 @@
 import typing
 
 import pydantic
-from .......core.pydantic_utilities import IS_PYDANTIC_V2, UniversalBaseModel
+from .....core.pydantic_utilities import IS_PYDANTIC_V2, UniversalBaseModel
 
 
 class WafBody(UniversalBaseModel):

methodwebscan-0.22.0/src/methodwebscan/resources/common/resources/waf/waf_detection.py

@@ -0,0 +1,27 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import typing
+
+import pydantic
+from .....core.pydantic_utilities import IS_PYDANTIC_V2, UniversalBaseModel
+from ..http.http_request_response import HttpRequestResponse
+from .waf_fingerprint import WafFingerprint
+from .waf_provider_enum import WafProviderEnum
+
+
+class WafDetection(UniversalBaseModel):
+    provider: WafProviderEnum
+    request: HttpRequestResponse
+    fingerprint: typing.Optional[WafFingerprint] = None
+    matched_headers: typing.Optional[typing.List[str]] = pydantic.Field(alias="matchedHeaders", default=None)
+    matched_server_header_values: typing.Optional[typing.List[str]] = pydantic.Field(
+        alias="matchedServerHeaderValues", default=None
+    )
+    matched_body_patterns: typing.Optional[typing.List[str]] = pydantic.Field(alias="matchedBodyPatterns", default=None)
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="forbid")  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            extra = pydantic.Extra.forbid

{methodwebscan-0.20.0/src/methodwebscan/resources/pentest/resources/waf/resources/detect → methodwebscan-0.22.0/src/methodwebscan/resources/common/resources/waf}/waf_fingerprint.py

@@ -3,16 +3,16 @@
 import typing
 
 import pydantic
-from .......core.pydantic_utilities import IS_PYDANTIC_V2, UniversalBaseModel
+from .....core.pydantic_utilities import IS_PYDANTIC_V2, UniversalBaseModel
 from .waf_body import WafBody
 from .waf_provider_enum import WafProviderEnum
 
 
 class WafFingerprint(UniversalBaseModel):
     provider: WafProviderEnum
-    headers: typing.List[str]
-    server_header_values: typing.List[str] = pydantic.Field(alias="serverHeaderValues")
-    body: typing.List[WafBody]
+    headers: typing.Optional[typing.List[str]] = None
+    server_header_values: typing.Optional[typing.List[str]] = pydantic.Field(alias="serverHeaderValues", default=None)
+    body: typing.Optional[typing.List[WafBody]] = None
 
     if IS_PYDANTIC_V2:
         model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="forbid")  # type: ignore # Pydantic v2

{methodwebscan-0.20.0 → methodwebscan-0.22.0}/src/methodwebscan/resources/discover/__init__.py

@@ -25,6 +25,7 @@ from .resources import (
     DiscoverProbeConfig,
     DiscoverProbeReport,
     DiscoverProbeResult,
+    DiscoverProbeTargetInfo,
     DiscoverRequestConfig,
     DiscoverRequestReport,
     DiscoverRequestResult,
@@ -94,6 +95,7 @@ __all__ = [
     "DiscoverProbeConfig",
     "DiscoverProbeReport",
     "DiscoverProbeResult",
+    "DiscoverProbeTargetInfo",
     "DiscoverRequestConfig",
     "DiscoverRequestReport",
     "DiscoverRequestResult",

{methodwebscan-0.20.0 → methodwebscan-0.22.0}/src/methodwebscan/resources/discover/resources/__init__.py

@@ -24,7 +24,7 @@ from .directory import (
     WordlistType,
 )
 from .page import DiscoverPageConfig, DiscoverPageReport, DiscoverPageResult
-from .probe import DiscoverProbeConfig, DiscoverProbeReport, DiscoverProbeResult
+from .probe import DiscoverProbeConfig, DiscoverProbeReport, DiscoverProbeResult, DiscoverProbeTargetInfo
 from .request import DiscoverRequestConfig, DiscoverRequestReport, DiscoverRequestResult, RequestFile, TlsCertificate
 from .route import (
     DiscoverRouteConfig,
@@ -83,6 +83,7 @@ __all__ = [
     "DiscoverProbeConfig",
     "DiscoverProbeReport",
     "DiscoverProbeResult",
+    "DiscoverProbeTargetInfo",
     "DiscoverRequestConfig",
     "DiscoverRequestReport",
     "DiscoverRequestResult",

methodwebscan-0.22.0/src/methodwebscan/resources/discover/resources/directory/directory_target_info.py

@@ -0,0 +1,26 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import typing
+
+import pydantic
+from .....core.pydantic_utilities import IS_PYDANTIC_V2, UniversalBaseModel
+from ....common.resources.http.http_request_response import HttpRequestResponse
+from ....common.resources.waf.waf_detection import WafDetection
+from .directory_frontier import DirectoryFrontier
+
+
+class DirectoryTargetInfo(UniversalBaseModel):
+    target: str
+    baseline_attempts: typing.Optional[typing.List[HttpRequestResponse]] = pydantic.Field(
+        alias="baselineAttempts", default=None
+    )
+    attempts: typing.Optional[typing.List[HttpRequestResponse]] = None
+    frontiers: typing.Optional[typing.List[DirectoryFrontier]] = None
+    waf_detection: typing.Optional[WafDetection] = pydantic.Field(alias="wafDetection", default=None)
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="forbid")  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            extra = pydantic.Extra.forbid

{methodwebscan-0.20.0 → methodwebscan-0.22.0}/src/methodwebscan/resources/discover/resources/page/discover_page_result.py

@@ -5,6 +5,7 @@ import typing
 import pydantic
 from .....core.pydantic_utilities import IS_PYDANTIC_V2, UniversalBaseModel
 from ....common.resources.http.http_request_response import HttpRequestResponse
+from ....common.resources.waf.waf_detection import WafDetection
 
 
 class DiscoverPageResult(UniversalBaseModel):
@@ -12,6 +13,7 @@ class DiscoverPageResult(UniversalBaseModel):
     screenshot: typing.Optional[str] = None
     screenshot_perceptual_hash: typing.Optional[str] = pydantic.Field(alias="screenshotPerceptualHash", default=None)
     html_title: typing.Optional[str] = pydantic.Field(alias="htmlTitle", default=None)
+    waf_detection: typing.Optional[WafDetection] = pydantic.Field(alias="wafDetection", default=None)
 
     if IS_PYDANTIC_V2:
         model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="forbid")  # type: ignore # Pydantic v2

{methodwebscan-0.20.0 → methodwebscan-0.22.0}/src/methodwebscan/resources/discover/resources/probe/__init__.py

@@ -5,5 +5,6 @@
 from .discover_probe_config import DiscoverProbeConfig
 from .discover_probe_report import DiscoverProbeReport
 from .discover_probe_result import DiscoverProbeResult
+from .discover_probe_target_info import DiscoverProbeTargetInfo
 
-__all__ = ["DiscoverProbeConfig", "DiscoverProbeReport", "DiscoverProbeResult"]
+__all__ = ["DiscoverProbeConfig", "DiscoverProbeReport", "DiscoverProbeResult", "DiscoverProbeTargetInfo"]

{methodwebscan-0.20.0 → methodwebscan-0.22.0}/src/methodwebscan/resources/discover/resources/probe/discover_probe_result.py

@@ -4,11 +4,11 @@ import typing
 
 import pydantic
 from .....core.pydantic_utilities import IS_PYDANTIC_V2, UniversalBaseModel
-from ....common.resources.http.http_request_response import HttpRequestResponse
+from .discover_probe_target_info import DiscoverProbeTargetInfo
 
 
 class DiscoverProbeResult(UniversalBaseModel):
-    targets: typing.Optional[typing.List[HttpRequestResponse]] = None
+    targets: typing.Optional[typing.List[DiscoverProbeTargetInfo]] = None
 
     if IS_PYDANTIC_V2:
         model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="forbid")  # type: ignore # Pydantic v2

methodwebscan-0.20.0/src/methodwebscan/resources/discover/resources/directory/directory_target_info.py → methodwebscan-0.22.0/src/methodwebscan/resources/discover/resources/probe/discover_probe_target_info.py

@@ -5,14 +5,13 @@ import typing
 import pydantic
 from .....core.pydantic_utilities import IS_PYDANTIC_V2, UniversalBaseModel
 from ....common.resources.http.http_request_response import HttpRequestResponse
-from .directory_frontier import DirectoryFrontier
+from ....common.resources.waf.waf_detection import WafDetection
 
 
-class DirectoryTargetInfo(UniversalBaseModel):
+class DiscoverProbeTargetInfo(UniversalBaseModel):
     target: str
-    baseline_attempts: typing.List[HttpRequestResponse] = pydantic.Field(alias="baselineAttempts")
     attempts: typing.List[HttpRequestResponse]
-    frontiers: typing.Optional[typing.List[DirectoryFrontier]] = None
+    waf_detection: typing.Optional[WafDetection] = pydantic.Field(alias="wafDetection", default=None)
 
     if IS_PYDANTIC_V2:
         model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="forbid")  # type: ignore # Pydantic v2

{methodwebscan-0.20.0 → methodwebscan-0.22.0}/src/methodwebscan/resources/discover/resources/request/discover_request_result.py

@@ -5,6 +5,7 @@ import typing
 import pydantic
 from .....core.pydantic_utilities import IS_PYDANTIC_V2, UniversalBaseModel
 from ....common.resources.http.http_request_response import HttpRequestResponse
+from ....common.resources.waf.waf_detection import WafDetection
 from .tls_certificate import TlsCertificate
 
 
@@ -13,6 +14,7 @@ class DiscoverRequestResult(UniversalBaseModel):
     tls_certificates: typing.Optional[typing.List[TlsCertificate]] = pydantic.Field(
         alias="tlsCertificates", default=None
     )
+    waf_detection: typing.Optional[WafDetection] = pydantic.Field(alias="wafDetection", default=None)
 
     if IS_PYDANTIC_V2:
         model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="forbid")  # type: ignore # Pydantic v2

{methodwebscan-0.20.0 → methodwebscan-0.22.0}/src/methodwebscan/resources/enumerate/resources/general/resources/ratelimit/rate_limit_attempt.py

@@ -5,8 +5,8 @@ import typing
 import pydantic
 from .......core.pydantic_utilities import IS_PYDANTIC_V2, UniversalBaseModel
 from ......common.resources.http.http_request_response import HttpRequestResponse
-from ......pentest.resources.waf.resources.detect.waf_fingerprint import WafFingerprint
-from ......pentest.resources.waf.resources.detect.waf_provider_enum import WafProviderEnum
+from ......common.resources.waf.waf_fingerprint import WafFingerprint
+from ......common.resources.waf.waf_provider_enum import WafProviderEnum
 
 
 class RateLimitAttempt(UniversalBaseModel):

{methodwebscan-0.20.0 → methodwebscan-0.22.0}/src/methodwebscan/resources/pentest/resources/waf/__init__.py

@@ -5,13 +5,10 @@
 from .resources import (
     PentestWafDetectConfig,
     PentestWafDetectReport,
-    WafBody,
     WafDetectAttempt,
     WafDetectResult,
     WafDetectTarget,
     WafDetected,
-    WafFingerprint,
-    WafProviderEnum,
     WafRuleCategoryEnum,
     detect,
 )
@@ -19,13 +16,10 @@ from .resources import (
 __all__ = [
     "PentestWafDetectConfig",
     "PentestWafDetectReport",
-    "WafBody",
     "WafDetectAttempt",
     "WafDetectResult",
     "WafDetectTarget",
     "WafDetected",
-    "WafFingerprint",
-    "WafProviderEnum",
     "WafRuleCategoryEnum",
     "detect",
 ]

{methodwebscan-0.20.0 → methodwebscan-0.22.0}/src/methodwebscan/resources/pentest/resources/waf/resources/__init__.py

@@ -6,26 +6,20 @@ from . import detect
 from .detect import (
     PentestWafDetectConfig,
     PentestWafDetectReport,
-    WafBody,
     WafDetectAttempt,
     WafDetectResult,
     WafDetectTarget,
     WafDetected,
-    WafFingerprint,
-    WafProviderEnum,
     WafRuleCategoryEnum,
 )
 
 __all__ = [
     "PentestWafDetectConfig",
     "PentestWafDetectReport",
-    "WafBody",
     "WafDetectAttempt",
     "WafDetectResult",
     "WafDetectTarget",
     "WafDetected",
-    "WafFingerprint",
-    "WafProviderEnum",
     "WafRuleCategoryEnum",
     "detect",
 ]

{methodwebscan-0.20.0 → methodwebscan-0.22.0}/src/methodwebscan/resources/pentest/resources/waf/resources/detect/__init__.py

@@ -4,24 +4,18 @@
 
 from .pentest_waf_detect_config import PentestWafDetectConfig
 from .pentest_waf_detect_report import PentestWafDetectReport
-from .waf_body import WafBody
 from .waf_detect_attempt import WafDetectAttempt
 from .waf_detect_result import WafDetectResult
 from .waf_detect_target import WafDetectTarget
 from .waf_detected import WafDetected
-from .waf_fingerprint import WafFingerprint
-from .waf_provider_enum import WafProviderEnum
 from .waf_rule_category_enum import WafRuleCategoryEnum
 
 __all__ = [
     "PentestWafDetectConfig",
     "PentestWafDetectReport",
-    "WafBody",
     "WafDetectAttempt",
     "WafDetectResult",
     "WafDetectTarget",
     "WafDetected",
-    "WafFingerprint",
-    "WafProviderEnum",
     "WafRuleCategoryEnum",
 ]

{methodwebscan-0.20.0 → methodwebscan-0.22.0}/src/methodwebscan/resources/pentest/resources/waf/resources/detect/waf_detected.py

@@ -4,8 +4,8 @@ import typing
 
 import pydantic
 from .......core.pydantic_utilities import IS_PYDANTIC_V2, UniversalBaseModel
-from .waf_fingerprint import WafFingerprint
-from .waf_provider_enum import WafProviderEnum
+from ......common.resources.waf.waf_fingerprint import WafFingerprint
+from ......common.resources.waf.waf_provider_enum import WafProviderEnum
 from .waf_rule_category_enum import WafRuleCategoryEnum