Merge pull request #47 from F5-Labs/development

Development

.gitignore

@@ -1,5 +1,4 @@
-
 build/*
-cryptonice/__pychache__/*
+cryptonice/__pycache__/*
 cryptonice.egg-info/*
-dist/*
+dist/*

Dockerfile

@@ -1,5 +1,5 @@
 FROM python:3.7
-LABEL version="1.4.0.2"
+LABEL version="1.4.1"
 LABEL maintainer="f5labs@f5.com"
 RUN pip3 install pycurl
 RUN pip3 install cryptonice

aws_sample_scan.json

@@ -0,0 +1,23 @@
+{
+	"_scan_options": ["DNS", "HTTP2", "HTTP", "JARM", "TLS"],
+	"_tls_params": ["certificate_info", "ssl_2_0_cipher_suites", "ssl_3_0_cipher_suites", "tls_1_0_cipher_suites",
+	                    "tls_1_1_cipher_suites", "tls_1_2_cipher_suites", "tls_1_3_cipher_suites", "tls_compression",
+	                    "tls_1_3_early_data", "openssl_ccs_injection", "heartbleed", "robot", "tls_fallback_scsv",
+	                    "session_renegotiation", "session_resumption", "session_resumption_rate", "http_headers"],
+	"_tls_params_if_blank": ["certificate_info", "ssl_2_0_cipher_suites", "ssl_3_0_cipher_suites", "tls_1_0_cipher_suites",
+	                    "tls_1_1_cipher_suites", "tls_1_2_cipher_suites", "tls_1_3_cipher_suites", "tls_compression",
+	                    "tls_1_3_early_data", "http_headers"],
+	"id": "Test scan",
+	"port": 443,
+	"scans": ["DNS", "HTTP2", "HTTP", "JARM", "TLS", "PWNED"],
+	"tls_params": [],
+	"http_body": true,
+	"force_redirect": true,
+	"print_out": true,
+	"generate_json": true,
+	"json_path" : "./results",
+	"recommendations": false,
+	"targets": ["www.f5.com", "f5labs.com"],
+	"geolocation": true,
+	"site_pos": 1
+}

awssetup.py

@@ -0,0 +1,73 @@
+# cryptonice
+# setup.py
+
+from pathlib import Path
+from setuptools import find_packages
+import sys
+from os import path
+from pathlib import Path
+import cryptonice.__init__
+
+# The directory containing this file
+HERE = Path(__file__).parent
+
+# Setup file based on cryptonice/setup.py
+root_path = Path(__file__).parent.absolute()
+
+print('Root path = ' + str(root_path))
+# The text of the README file
+README = (HERE / "README.md").read_text()
+
+
+
+# For cx_freeze builds, we need a special setup() function
+if len(sys.argv) > 1 and sys.argv[1] == "build_exe":
+    from cx_Freeze import setup
+    from cx_Freeze import Executable
+else:
+    from setuptools import setup
+
+    # Create fake Executable that does nothing so the setup.py file can be used on Linux
+    class Executable:  # type: ignore
+        def __init__(self, script, targetName):  # type: ignore
+            pass
+
+
+# This call to setup() does all the work
+setup(
+    name="cryptonice",
+    version=cryptonice.__version__,
+    description="Perform TLS scan of a domain",
+    long_description=README,
+    long_description_content_type="text/markdown",
+    url="https://github.com/F5-Labs/cryptonice",
+    author="F5 Labs",
+    author_email="f5labs@f5.com",
+    license="MIT",
+    classifiers=[
+        "License :: OSI Approved :: MIT License",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.7",
+    ],
+    python_requires='>=3',
+    packages=["cryptonice"],
+    include_package_data=True,
+    package_data={'cryptonice': ['technologies.json', './maxmind/*.mmdb']},
+    install_requires=["sslyze>=4.0.0",
+                      "dnspython>=2.0.0",
+                      "http-client>=0.1.21",
+                      "urllib3>=1.22",
+                      "ipaddress>=1.0.22",
+                      "pathlib~=1.0.1",
+                      "bs4>=0.0.1",
+                      "regex>=2020.5.14",
+                      "geoip2"],
+    entry_points={
+        "console_scripts": [
+            "cryptonice=cryptonice.__main__:main",
+        ]
+    },
+    # cx_freeze info for executable builds with Python embedded
+    options={"build_exe": {"packages": ["sslyze", "urllib3", "dns", "http_client", "ipaddress", "pathlib", "cryptography"],
+                           "include_files": ["cryptonice"]}})
+#