WIP refactor for packaging

setup.py

+#!/usr/bin/env python3
+# coding: utf-8
+
+from setuptools import setup, find_packages
+
+setup(
+    name="Pass-Checker",
+    version="0.1",
+    packages=find_packages(),
+    scripts=['pass-checker.py'],
+
+    # Project uses reStructuredText, so ensure that the docutils get
+    # installed or upgraded on the target machine
+    install_requires=['click', 'zxcvbn', 'http.server', 'cgi', 'cgitb', 'getpass'],
+
+    package_data={
+        # If any package contains *.txt or *.rst files, include them:
+        '': ['*.txt', '*.rst'],
+    },
+
+    # metadata for upload to PyPI
+    author="Tetras Libre",
+    author_email="David.Beniamine@Tetras-Libre.fr",
+    description="PassCheker est un système d'évaluation de mot de passes basé sur zxcvbn-python",
+    license="AGPL",
+    keywords="password, zxcvbn",
+    url="https://gitlab.tetras-libre.fr/tetras-libre/PasswordTester",   # project home page, if any
+
+    # could also include long_description, download_url, classifiers, etc.
+)

src/apache/pass-checker.conf

+<VirtualHost *>
+    ServerAdmin <ADMIN>
+    ServerName <FQDN>
+    ServerSignature Off
+    CustomLog /var/log/apache2/passchecker_access.log combined
+    ErrorLog /var/log/apache2/passchecker_error.log
+    ErrorLog syslog:local2
+
+    ProxyVia On
+    ProxyRequests Off
+    ProxyPass / http://localhost:8842/
+    ProxyPassReverse / http://localhost:8842/
+    ProxyPreserveHost on
+    <Proxy *>
+        Options FollowSymLinks MultiViews
+        AllowOverride All
+        Order allow,deny
+        allow from all
+    </Proxy>
+    Include /etc/apache2//ssl.conf
+</VirtualHost>
+

src/console.py → src/commands/cli.py

@@ -19,6 +19,8 @@
 from getpass import getpass
 from test_pass import test_pass
 
+
+def cli():
     # Read password
     passwd = getpass("Merci d'entrer un mot de passe qui ne sera pas affiché\n")
 
@@ -31,3 +33,6 @@ while True:
         user_inputs.append(word)
 
     print(test_pass(passwd, user_inputs))
+
+if __name__ == '__main__':
+    cli()

src/server.py → src/commands/web.py

@@ -23,7 +23,7 @@ import cgitb
 
 cgitb.enable()
 
-def run(addr, port):
+def serve(addr, port):
     server_address = (addr, port)
     server = HTTPServer
     handler = CGIHTTPRequestHandler
@@ -34,4 +34,4 @@ def run(addr, port):
     httpd.serve_forever()
 
 if __name__ == "__main__":
-    run("localhost", 8080)
+    serve("localhost", 8080)

src/pass-checker.py

+#!/usr/bin/env python3
+# coding: utf-8
+
+import click
+from server import serve
+from console import cli
+
+@click.option('--server/--no-server', default=False, help='Start the server for web interface, no means use CLI')
+@click.option('--port', default=8842, help='Port on which the web server should listen')
+@click.option('--address', default='localhost', help='Address on which the web server should listen')
+def passchecker(server, port, address):
+
+
+if __name__ == '__main__':
+    passchecker()

src/service/pass-checker.service

+[Unit]
+Description=Pass-Checker Service
+After=network.target
+
+[Service]
+Type=simple
+User=root
+ExecStart=python3 /usr/local/sbin/pass-checker.py --server
+
+[Install]
+WantedBy=multi-user.target
+