dementor 1.0.0.dev14__tar.gz → 1.0.0.dev15__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/PKG-INFO +1 -1
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/__init__.py +1 -1
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/db/connector.py +15 -2
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/standalone.py +5 -1
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor.egg-info/PKG-INFO +1 -1
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/pyproject.toml +1 -1
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/LICENSE +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/README.md +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/__main__.py +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/assets/Dementor.toml +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/assets/banner.txt +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/assets/www/error_page.html +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/assets/www/upnp-default/dd.xml +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/assets/www/upnp-default/present.html +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/assets/www/upnp-default/scpd.xml +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/assets/www/wpad.dat +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/config/__init__.py +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/config/attr.py +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/config/session.py +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/config/toml.py +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/config/util.py +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/db/__init__.py +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/db/model.py +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/filters.py +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/loader.py +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/log/__init__.py +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/log/hexdump.py +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/log/logger.py +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/log/stream.py +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/paths.py +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/protocols/__init__.py +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/protocols/ftp.py +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/protocols/http.py +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/protocols/imap.py +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/protocols/ipp.py +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/protocols/kerberos.py +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/protocols/ldap.py +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/protocols/llmnr.py +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/protocols/mdns.py +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/protocols/msrpc/__init__.py +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/protocols/msrpc/dcom.py +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/protocols/msrpc/epm.py +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/protocols/msrpc/rpc.py +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/protocols/msrpc.py +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/protocols/mssql.py +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/protocols/mysql.py +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/protocols/netbios.py +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/protocols/ntlm.py +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/protocols/pop3.py +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/protocols/quic.py +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/protocols/smb.py +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/protocols/smtp.py +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/protocols/spnego.py +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/protocols/ssdp.py +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/protocols/upnp.py +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/protocols/x11.py +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor/servers.py +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor.egg-info/SOURCES.txt +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor.egg-info/dependency_links.txt +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor.egg-info/entry_points.txt +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor.egg-info/requires.txt +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/dementor.egg-info/top_level.txt +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/docs/README.pypi.md +0 -0
- {dementor-1.0.0.dev14 → dementor-1.0.0.dev15}/setup.cfg +0 -0
|
@@ -17,7 +17,8 @@
|
|
|
17
17
|
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
18
18
|
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
19
19
|
# SOFTWARE.
|
|
20
|
-
|
|
20
|
+
# pyright: reportUninitializedInstanceVariable=false
|
|
21
|
+
import typing
|
|
21
22
|
from sqlalchemy import Engine, create_engine
|
|
22
23
|
|
|
23
24
|
from dementor.config.session import SessionConfig
|
|
@@ -36,6 +37,13 @@ class DatabaseConfig(TomlConfig):
|
|
|
36
37
|
A("db_driver", "Driver", None),
|
|
37
38
|
]
|
|
38
39
|
|
|
40
|
+
if typing.TYPE_CHECKING:
|
|
41
|
+
db_raw_path: str | None
|
|
42
|
+
db_path: str
|
|
43
|
+
db_duplicate_creds: bool
|
|
44
|
+
db_dialect: str | None
|
|
45
|
+
db_driver: str | None
|
|
46
|
+
|
|
39
47
|
|
|
40
48
|
def init_dementor_db(session: SessionConfig) -> Engine | None:
|
|
41
49
|
engine = init_engine(session)
|
|
@@ -57,7 +65,12 @@ def init_engine(session: SessionConfig) -> Engine | None:
|
|
|
57
65
|
|
|
58
66
|
if dialect == "sqlite":
|
|
59
67
|
if path != ":memory:":
|
|
60
|
-
|
|
68
|
+
real_path = session.resolve_path(path)
|
|
69
|
+
if not real_path.parent.exists():
|
|
70
|
+
dm_logger.debug(f"Creating database directory {real_path.parent}")
|
|
71
|
+
real_path.parent.mkdir(parents=True, exist_ok=True)
|
|
72
|
+
|
|
73
|
+
path = f"/{real_path}"
|
|
61
74
|
|
|
62
75
|
# see https://docs.sqlalchemy.org/en/20/core/engines.html#database-urls
|
|
63
76
|
raw_path = f"{dialect}+{driver}://{path}"
|
|
@@ -71,6 +71,8 @@ def serve(
|
|
|
71
71
|
if session is None:
|
|
72
72
|
session = SessionConfig()
|
|
73
73
|
|
|
74
|
+
workspace_path = pathlib.Path(session.workspace_path)
|
|
75
|
+
workspace_path.mkdir(parents=True, exist_ok=True)
|
|
74
76
|
logger.init()
|
|
75
77
|
logger.ProtocolLogger.init_logfile(session)
|
|
76
78
|
log_stream.init_streams(session)
|
|
@@ -436,8 +438,10 @@ def main(
|
|
|
436
438
|
loader = ProtocolLoader()
|
|
437
439
|
session = SessionConfig()
|
|
438
440
|
session.analysis = analyze
|
|
439
|
-
|
|
441
|
+
workspace_path = pathlib.Path(session.workspace_path)
|
|
442
|
+
workspace_path.mkdir(parents=True, exist_ok=True)
|
|
440
443
|
|
|
444
|
+
session.protocols = loader.get_protocols(session)
|
|
441
445
|
if not quiet:
|
|
442
446
|
main_print_options(session, interface, config_path)
|
|
443
447
|
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|