merge files because heriku ha problems with relative imports

Author: offboarded-x233534

.gitignore

@@ -24,4 +24,7 @@ peewee.db
 *.pyc
 /dist/
 /*.egg-info
-build/
+build/
+
+# heroku
+venv/

Procfile

@@ -1 +1 @@
-web: cs-gh-proxy -e wsgi -p 8881 --authType allGitHubUsers --owner comsysto --repository github-pages-basic-auth-proxy --obfuscator 086e41eb6ff7a50ad33ad742dbaa2e70b75740c4950fd5bbbdc71981e6fe88e3
+web: python cs_proxy/proxy.py -e heroku -p $PORT --authType allGitHubUsers --owner comsysto --repository github-pages-basic-auth-proxy --obfuscator 086e41eb6ff7a50ad33ad742dbaa2e70b75740c4950fd5bbbdc71981e6fe88e3

cs_proxy/proxy.py

@@ -1,4 +1,6 @@
 import sys, os
+import argparse
+import colorama
 from bottle import route, request, response, run, hook, abort, redirect, error, install, auth_basic
 import simplejson as json
 import random
@@ -10,6 +12,34 @@
 from jose.exceptions import JWSError
 import datetime
 
+def main():
+    #
+    # CLI PARAMS
+    #
+    parser = argparse.ArgumentParser(description='comSysto GitHub Pages Auth Basic Proxy')
+
+    parser.add_argument("-e", "--environment", help='Which environment.', choices=['cgi', 'wsgi', 'heroku'])
+    parser.add_argument("-gho", "--owner", help='the owner of the repository. Either organizationname or username.')
+    parser.add_argument("-ghr", "--repository", help='the repository name.')
+    parser.add_argument("-obf", "--obfuscator", help='the subfolder-name in gh-pages branch used as obfuscator')
+    parser.add_argument("-p", "--port", help='the port to run proxy e.g. 8881')
+    parser.add_argument("-a", "--authType", help='how should users auth.', choices=['allGitHubUsers', 'onlyGitHubOrgUsers'] )
+
+
+    args = parser.parse_args()
+    if not args.environment:
+        print ('USAGE')
+        print ('    proxy that allows only members of the organization to access page: (owner must be an GitHub Organization)')
+        print ('      $> cs-gh-proxy -e wsgi -p 8881 --authType onlyGitHubOrgUsers --owner comsysto --repository github-pages-basic-auth-proxy --obfuscator 086e41eb6ff7a50ad33ad742dbaa2e70b75740c4950fd5bbbdc71981e6fe88e3')
+        print ('')
+        print ('    proxy that allows all GitHub Users to access page: (owner can be GitHub Organization or normal user)')
+        print ('      $> cs-gh-proxy -e wsgi -p 8881 --authType allGitHubUsers --owner comsysto --repository github-pages-basic-auth-proxy --obfuscator 086e41eb6ff7a50ad33ad742dbaa2e70b75740c4950fd5bbbdc71981e6fe88e3')
+        print ('')
+
+        sys.exit(1)
+
+    run_proxy(args)
+
 #
 # global vars
 #
@@ -128,6 +158,8 @@ def proxy_trough_root_page():
     #
     if args.environment == 'wsgi':
         run(host='localhost', port=args.port, debug=True)
+    if args.environment == 'heroku':
+        run(host="0.0.0.0", port=int(os.environ.get("PORT", 5000)))
     else:
         run(server='cgi')
 

cs_proxy/run_proxy.py

@@ -21,5 +21,5 @@
       ],
       zip_safe=False,
       entry_points = {
-          'console_scripts': ['cs-gh-proxy=cs_proxy.run_proxy:main'],
+          'console_scripts': ['cs-gh-proxy=cs_proxy.proxy:main'],
       })