Initial commit

Author: berrysauce

main.py

@@ -60,6 +60,9 @@ def add_report(domain, description, falsepositive: bool, response):
     except IndexError:
         pass
 
+    blacklist_status = blacklist_db.fetch({"blacklisted": True}).items
+    blacklist_domain = blacklist_db.fetch({"domain": domain}).items
+
     res = requests.get("https://api.stopmodreposts.org/sites.txt")
 
     if domain in res.text:
@@ -75,7 +78,7 @@ def add_report(domain, description, falsepositive: bool, response):
                 "false-positive": falsepositive
             }
         }
-    elif len(blacklist_db.fetch({"domain": domain}).items) != 0:
+    elif len(blacklist_status) != 0 and len(blacklist_domain) != 0:
         response.status_code = status.HTTP_400_BAD_REQUEST
         return response, {
             "detail": "Failed to report - domain blacklisted",
@@ -263,7 +266,13 @@ def get_api_waitlist():
 
 @app.get("/api/v1/blacklist")
 def get_api_blacklist():
-    return {"detail": "Blacklist (WIP)"}
+    res = blacklist_db.fetch({"blacklisted": True}).items
+    final = []
+    for site in res:
+        final.append({
+            "domain": site["domain"]
+        })
+    return final
 
 @app.post("/api/v1/report", status_code=201)
 def post_api_report(response: Response,
@@ -289,11 +298,16 @@ def post_api_report(response: Response,
     """
     Reporting endpoint for reposting sites and false-positives
     """
+    if falsepositive:
+        baseURL = "/forms/falsepositive"
+    else:
+        baseURL = "/forms/report"
+
     if captcha is None:
-        return RedirectResponse(url=f"/forms/report?alert=captcha", status_code=status.HTTP_303_SEE_OTHER)
+        return RedirectResponse(url=f"{baseURL}?alert=captcha", status_code=status.HTTP_303_SEE_OTHER)
     else:
         if verifycaptcha(captcha) is False:
-            return RedirectResponse(url=f"/forms/report?alert=captcha", status_code=status.HTTP_303_SEE_OTHER)
+            return RedirectResponse(url=f"{baseURL}?alert=captcha", status_code=status.HTTP_303_SEE_OTHER)
 
     if domain == None or description == None:
         raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Required form fields missing")
@@ -306,11 +320,11 @@ def post_api_report(response: Response,
     )
 
     if response.status_code == status.HTTP_409_CONFLICT:
-        return RedirectResponse("/forms/report?alert=listed", status_code=status.HTTP_303_SEE_OTHER)
+        return RedirectResponse(f"{baseURL}?alert=listed", status_code=status.HTTP_303_SEE_OTHER)
     elif response.status_code == status.HTTP_400_BAD_REQUEST:
-        return RedirectResponse("/forms/report?alert=blocked", status_code=status.HTTP_303_SEE_OTHER)
+        return RedirectResponse(f"{baseURL}?alert=blocked", status_code=status.HTTP_303_SEE_OTHER)
     else:
-        return RedirectResponse("/forms/report?alert=success", status_code=status.HTTP_303_SEE_OTHER)
+        return RedirectResponse(f"{baseURL}?alert=success", status_code=status.HTTP_303_SEE_OTHER)
 
 
 if __name__ == "__main__":

templates/falsepositive.html

@@ -38,7 +38,7 @@ <h2 class="text-start" style="font-size: 18px;margin-bottom: 3px;color: rgb(193,
                                 <hr>
                                 <h2 class="text-start" style="font-size: 18px;margin-bottom: 10px;color: rgb(33,37,41);">Report False-Positive Form<span class="float-end" style="font-size: 10px;color: rgb(174,174,174);">FPR-01 / API V1</span></h2>
                                 {% autoescape false %} {{ alert_html }} {% endautoescape %}
-                                <form action="/api/v1/formreport" method="post" enctype="multipart/form-data">
+                                <form action="/api/v1/formreport?falsepositive=true" method="post" enctype="multipart/form-data">
                                     <input class="form-control" type="url" style="margin-bottom: 10px;" name="domain" placeholder="Domain" required>
                                     <textarea class="form-control" style="margin-bottom: 10px;" placeholder="Describe the site and its content and why it should be removed from our list..." name="description" required></textarea>
                                     <div style="text-align: left!important;">

templates/progress.html

@@ -30,7 +30,7 @@ <h1 class="text-start mb-0" style="margin-top: 4px;font-size: 20px;">Submission
                             </div>
                             <div class="card-body">
                                 <div class="progress" style="background: rgb(247,247,247);border-radius: 5px;border-width: 1px;border-style: none;height: 32px;font-size: 18px;margin-top: 15px;--bs-danger: rgb(193,31,32);--bs-danger-rgb: 193,31,32;">
-                                    <div class="progress-bar bg-danger" aria-valuenow="{{ reviewed_percent }}" aria-valuemin="0" aria-valuemax="100" style="width: 42%;">{{ reviewed_percent }}%</div>
+                                    <div class="progress-bar bg-danger" aria-valuenow="{{ reviewed_percent }}" aria-valuemin="0" aria-valuemax="100" style="width: {{ reviewed_percent }}%;">{{ reviewed_percent }}%</div>
                                 </div>
                                 <p style="color: rgb(193,31,32);font-size: 14px;margin-bottom: 20px;margin-top: 5px;">{{ len_reviewed }} / {{ len_all }} Submissions marked as reviewed in current batch</p>
                                 <hr>