Dependencies reduction

Dockerfile

@@ -14,7 +14,8 @@ RUN apt update \
 
 COPY . .
 
-RUN python3 setup.py install
+RUN pip3 install --no-deps -r requirements.txt 
+RUN pip3 install --no-deps . 
 
 FROM debian:bullseye-slim
 

Dockerfile.headless

@@ -14,7 +14,8 @@ RUN apt update \
 
 COPY . .
 
-RUN python3 setup.py install
+RUN pip3 install --no-deps -r requirements.txt
+RUN pip3 install --no-deps .
 
 FROM debian:bullseye-slim
 

Dockerfile.test

@@ -18,5 +18,6 @@ WORKDIR /usr/src/app
 
 COPY . .
 
-RUN pip3 install .[sslyze]
-CMD ["python3", "setup.py", "test", "-vv"]
+RUN pip3 install --no-deps -r requirements.txt 
+RUN pip3 install .[test]
+CMD ["pytest"]

Makefile

@@ -1,5 +1,6 @@
 install: clean
-	python setup.py install
+	pip3 install --no-deps -r requirements.txt 
+	pip3 install --no-deps .
 
 test:
 	docker build -f Dockerfile.test --tag=wapiti_test .

Pipfile

@@ -10,28 +10,69 @@ pytest-asyncio = "==0.20.1"
 pytest-cov = ">=2.11.1"
 
 [packages]
-"httpx[brotli, socks]" = "==0.23.0"
-beautifulsoup4 = ">=4.10.0"
-mako = ">=1.1.4"
-markupsafe = "==2.1.1"
-pytest = ">=5.4.1"
-tld = ">=0.12.5"
-yaswfp = ">=0.9.3"
-six = ">=1.15.0"
-browser-cookie3 = "==0.16.2"
-sqlalchemy = ">=1.4.26"
-aiocache = "==0.11.1"
-aiosqlite = "==0.17.0"
-loguru = ">=0.5.3"
-dnspython = "==2.1.0"
-httpcore = ">=0.15.0"
-sslyze = "==5.0.6"
-humanize = "==4.4.0"
-mitmproxy = "==8.0.0"
-h11 = "==0.12"
-arsenic = "==21.8"
-pyasn1 = "==0.4.8"
-aiohttp = "==3.8.1"
+aiocache='0.11.1'
+aiohttp='3.8.3'
+aiosignal='1.3.1'
+aiosqlite='0.17.0'
+anyio='3.6.2'
+arsenic='21.8'
+asgiref='3.5.2'
+async-timeout='4.0.2'
+attrs='22.1.0'
+beautifulsoup4='4.11.1'
+browser-cookie3='0.16.2'
+certifi='2022.9.24'
+cffi='1.15.1'
+charset-normalizer='3.0.1'
+click='8.1.3'
+cryptography='38.0.3'
+dnspython='2.2.1'
+Flask='2.2.2'
+frozenlist='1.3.3'
+greenlet='2.0.1'
+h11='0.14.0'
+h2='4.1.0'
+hpack='4.0.0'
+httpcore='0.15.0'
+httpx={extra = ['socks', 'brotli'], version = '0.23.0'}
+hyperframe='6.0.1'
+idna='3.4'
+importlib-metadata='5.0.0'
+itsdangerous='2.1.2'
+Jinja2='3.1.2'
+kaitaistruct='0.10'
+keyring='23.11.0'
+ldap3='2.9.1'
+loguru='0.6.0'
+lz4='4.0.2'
+Mako='1.2.4'
+MarkupSafe='2.1.1'
+mitmproxy='9.0.1'
+mitmproxy-wireguard='0.1.18'
+msgpack='1.0.4'
+multidict='6.0.2'
+passlib='1.7.4'
+pbkdf2='1.3'
+pyaes='1.6.1'
+pyasn1='0.4.8'
+pycryptodome='3.15.0'
+pyOpenSSL='22.1.0'
+pyparsing='3.0.9'
+pyperclip='1.8.2'
+rfc3986='2.0.0'
+"ruamel.yaml"='0.17.21'
+sniffio='1.3.0'
+SQLAlchemy='1.4.44'
+structlog='22.2.0'
+tld='0.12.6'
+typing-extensions='4.4.0'
+Werkzeug='2.2.2'
+wsproto='1.2.0'
+yarl='1.8.1'
+yaswfp='0.9.3'
+zipp='3.10.0'
+zstandard='0.19.0'
+
 
 [requires]
 python_version = "3.8"

pyproject.toml

@@ -0,0 +1,91 @@
+[build-system]
+requires = ["setuptools", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "wapiti3"
+version = "3.1.4"
+description = "A web application vulnerability scanner"
+readme  = "README.rst"
+requires-python = ">=3.8" 
+authors = [
+        {name="Nicolas Surribas", email="[email protected]"},
+]
+license = {file = "LICENSE"}
+classifiers = [
+        "Development Status :: 5 - Production/Stable",
+        "Environment :: Console",
+        "Intended Audience :: End Users/Desktop",
+        "Intended Audience :: Developers",
+        "Intended Audience :: System Administrators",
+        "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
+        "Natural Language :: English",
+        "Operating System :: MacOS :: MacOS X",
+        "Operating System :: POSIX",
+        "Operating System :: Unix",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Topic :: Security",
+        "Topic :: Internet :: WWW/HTTP :: Indexing/Search",
+        "Topic :: Software Development :: Testing"
+]
+dependencies = [
+        "aiocache==0.11.1",
+        "aiohttp==3.8.1",
+        "aiosqlite==0.17.0",
+        "arsenic==21.8",
+        "beautifulsoup4>=4.10.0",
+        "browser-cookie3==0.16.2",
+        "dnspython==2.1.0",
+        "h11==0.12",
+        "httpcore==0.15.0",
+        "httpx[brotli, socks]==0.23.0",
+        "loguru>=0.5.3",
+        "mako>=1.1.4",
+        "markupsafe==2.1.1",
+        "mitmproxy==8.0.0",
+        "pyasn1==0.4.8",
+        "six>=1.15.0",
+        "sqlalchemy>=1.4.26",
+        "tld>=0.12.5",
+        "yaswfp>=0.9.3" 
+]
+
+[project.urls]
+homepage = "https://wapiti-scanner.github.io/"
+repository = "https://github.com/wapiti-scanner/wapiti"
+
+[project.scripts]
+wapiti = "wapitiCore.main.wapiti:wapiti_asyncio_wrapper"
+wapiti-getcookie = "wapitiCore.main.getcookie:getcookie_asyncio_wrapper"
+
+[project.optional-dependencies]
+test = [
+        "humanize==4.4.0",
+        "pytest>=6.2.2", 
+        "pytest-cov>=2.11.1",
+        "pytest-asyncio==0.20.1",
+        "respx==0.20.0", 
+        "sslyze==5.0.6"
+]
+
+ssl = [
+        "humanize==4.4.0",
+        "sslyze==5.0.6"
+]
+
+[tool.setuptools.packages]
+find = {exclude=["tests"]}
+
+[tool.pytest.ini_options]
+testpaths = [
+    "tests",
+]
+addopts = "--cov --cov-report=xml"
+
+[tool.coverage.run]
+source = ["wapitiCore"]
+
+[tool.coverage.report]
+show_missing = true

requirements.txt

@@ -0,0 +1,64 @@
+aiocache==0.11.1
+aiohttp==3.8.3
+aiosignal==1.3.1
+aiosqlite==0.17.0
+anyio==3.6.2
+arsenic==21.8
+asgiref==3.5.2
+async-timeout==4.0.2
+attrs==22.1.0
+beautifulsoup4==4.11.1
+Brotli==1.0.9
+browser-cookie3==0.16.2
+certifi==2022.9.24
+cffi==1.15.1
+charset-normalizer==3.0.1
+click==8.1.3
+cryptography==38.0.3
+dnspython==2.2.1
+Flask==2.2.2
+frozenlist==1.3.3
+greenlet==2.0.1
+h11==0.14.0
+h2==4.1.0
+hpack==4.0.0
+httpcore==0.15.0
+httpx==0.23.0
+hyperframe==6.0.1
+idna==3.4
+importlib-metadata==5.0.0
+itsdangerous==2.1.2
+Jinja2==3.1.2
+kaitaistruct==0.10
+keyring==23.11.0
+ldap3==2.9.1
+loguru==0.6.0
+lz4==4.0.2
+Mako==1.2.4
+MarkupSafe==2.1.1
+mitmproxy==9.0.1
+mitmproxy-wireguard==0.1.18
+msgpack==1.0.4
+multidict==6.0.2
+passlib==1.7.4
+pbkdf2==1.3
+pyaes==1.6.1
+pyasn1==0.4.8
+pycryptodome==3.15.0
+pyOpenSSL==22.1.0
+pyparsing==3.0.9
+pyperclip==1.8.2
+rfc3986==2.0.0
+ruamel.yaml==0.17.21
+sniffio==1.3.0
+socksio==1.0.0
+SQLAlchemy==1.4.44
+structlog==22.2.0
+tld==0.12.6
+typing-extensions==4.4.0
+Werkzeug==2.2.2
+wsproto==1.2.0
+yarl==1.8.1
+yaswfp==0.9.3
+zipp==3.10.0
+zstandard==0.19.0