Updated README and catpchas are now toggled from the config

README.md

@@ -11,16 +11,27 @@ sudo pip3 install -r requirements.txt
 ```
 Create `/config.py` and fill out the parameters. Sample config:
 ```python
+# Leave default values for no CAPTCHAs
+CAPTCHA_LOGIN = False
+CAPTCHA_SUBMIT = False
 CAPTCHA_SITE_KEY = ""
 CAPTCHA_SECRET_KEY = ""
+
+# Flask secret key for sessions
 FLASK_SECRET = ""
 RESULTS_PER_PAGE = (25, 50, 100, 250, 500, 1000)
+# Headers for http crawler
 HEADERS = {}
+# Token for the crawl server, used by the server to communicate to the crawl server
 CRAWL_SERVER_TOKEN = ""
 CRAWL_SERVER_PORT = 5001
+# Number of crawler instances (one per task)
 CRAWL_SERVER_PROCESSES = 3
+# Number of threads per crawler instance
 CRAWL_SERVER_THREADS = 20
+# Allow ftp websites in /submit
 SUBMIT_FTP = False
+# Allow http(s) websites in /submit
 SUBMIT_HTTP = True
 ```
 

app.py

@@ -13,9 +13,12 @@ from task import TaskDispatcher, Task, CrawlServer
 from search.search import ElasticSearchEngine
 
 app = Flask(__name__)
+if config.CAPTCHA_SUBMIT or config.CAPTCHA_LOGIN:
     recaptcha = ReCaptcha(app=app,
                           site_key=config.CAPTCHA_SITE_KEY,
                           secret_key=config.CAPTCHA_SECRET_KEY)
+else:
+    recaptcha = None
 app.secret_key = config.FLASK_SECRET
 db = Database("db.sqlite3")
 cache = Cache(app, config={'CACHE_TYPE': 'simple'})
@@ -317,7 +320,7 @@ def home():
 @app.route("/submit")
 def submit():
     queued_websites = taskDispatcher.get_queued_tasks()
-    return render_template("submit.html", queue=queued_websites, recaptcha=recaptcha)
+    return render_template("submit.html", queue=queued_websites, recaptcha=recaptcha, show_captcha=config.CAPTCHA_SUBMIT)
 
 
 def try_enqueue(url):
@@ -356,7 +359,7 @@ def try_enqueue(url):
 
 @app.route("/enqueue", methods=["POST"])
 def enqueue():
-    # if recaptcha.verify():
+    if not config.CAPTCHA_SUBMIT or recaptcha.verify():
 
         url = os.path.join(request.form.get("url"), "")
         message, msg_type = try_enqueue(url)
@@ -364,15 +367,14 @@ def enqueue():
 
         return redirect("/submit")
 
-
+    else:
-# else:
+        flash("<strong>Error:</strong> Invalid captcha please try again", "danger")
-#     flash("<strong>Error:</strong> Invalid captcha please try again", "danger")
+        return redirect("/submit")
-#     return redirect("/submit")
 
 
 @app.route("/enqueue_bulk", methods=["POST"])
 def enqueue_bulk():
-    # if recaptcha.verify():
+    if not config.CAPTCHA_SUBMIT or recaptcha.verify():
 
         urls = request.form.get("urls")
         if urls:
@@ -392,23 +394,21 @@ def enqueue_bulk():
                 return redirect("/submit")
         else:
             return abort(500)
-
+    else:
-
+        flash("<strong>Error:</strong> Invalid captcha please try again", "danger")
-# else:
+        return redirect("/submit")
-#     flash("<strong>Error:</strong> Invalid captcha please try again", "danger")
-#     return redirect("/submit")
 
 
 @app.route("/admin")
 def admin_login_form():
     if "username" in session:
         return redirect("/dashboard")
-    return render_template("admin.html", recaptcha=recaptcha)
+    return render_template("admin.html", recaptcha=recaptcha, show_captcha=config.CAPTCHA_LOGIN)
 
 
 @app.route("/login", methods=["POST"])
 def admin_login():
-    if recaptcha.verify():
+    if not config.CAPTCHA_LOGIN or recaptcha.verify():
 
         username = request.form.get("username")
         password = request.form.get("password")

templates/admin.html

@@ -15,7 +15,9 @@
                         <input class="form-control" name="password" placeholder="Password" type="password">
                     </div>
 
+                    {% if show_captcha %}
                         {{ recaptcha.get_code()|safe }}
+                    {% endif %}
 
                     <input type="submit" value="Login">
 

templates/submit.html

@@ -25,9 +25,11 @@
                                 <input class="form-control" name="url" id="url" placeholder="URL">
                             </div>
                             <div class="row">
+                                {% if show_captcha %}
                                     <div class="col">
-{#                                    {{ recaptcha.get_code()|safe }}#}
+                                        {{ recaptcha.get_code()|safe }}
                                     </div>
+                                {% endif %}
                                 <div class="col">
                                     <input class="btn btn-primary" type="submit" value="Submit" title="Submit open directory">
                                 </div>
@@ -42,9 +44,11 @@
                                 <textarea class="form-control" name="urls" id="urls" rows="10" placeholder="One URL per line, max. 10"></textarea>
                             </div>
                             <div class="row">
+                                {% if show_captcha %}
                                     <div class="col">
-{#                                    {{ recaptcha.get_code()|safe }}#}
+                                        {{ recaptcha.get_code()|safe }}
                                     </div>
+                                {% endif %}
                                 <div class="col">
                                     <input class="btn btn-primary" type="submit" value="Submit" title="Submit open directories">
                                 </div>