Merge branch 'master' into main

.github/ISSUE_TEMPLATE/phishing.yml → .github/ISSUE_TEMPLATE/01-phishing.yml

@@ -1,24 +1,17 @@
+# https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/configuring-issue-templates-for-your-repository#creating-issue-forms
 name: Phishing Report
 description: File a Phishing report
-assignees:
-  - mitchellkrogza
-  - funilrys
 body:
   - type: textarea
     attributes:
       label: Phishing Domain/URL/IP(s)
       description: |
-        List the Domain/URI/IP for where the phishing occurs is
-        **mandatory**. 
-        The backticks (`) surrounding the Domain/URL/IPs are important,
-        it prevents the URL from becoming clickable.
+        List the Domain/URI/IP for where the phishing occurs is **mandatory**. 
+        The backticks (`) surrounding the Domain/URL/IPs are important, it prevents the URL from becoming clickable.
 
         Warn with "NSFW" where applicable.
 
-        **Help** To make the right commit for IP-addresses you have to
-        also prefix the CIDR notation, if you don't know what a CIDR
-        notation is, the right value is most likely `/32`, which in short
-        means exactly this IP address.
+        **Help** To make the right commit for IP-addresses you have to also prefix the CIDR notation, if you don't know what a CIDR notation is, the right value is most likely `/32`, which in short means exactly this IP address.
       placeholder: |
         example.com
         https://example.org/phishing
@@ -40,48 +33,40 @@ body:
     attributes:
       label: Describe your experience.
       description: |
-        Be as clear as possible: nobody can read your mind, and nobody
-        is looking at your issue over your shoulder.
+        Be as clear as possible: nobody can read your mind, and nobody is looking at your issue over your shoulder.
     validations:
       required: true
 
   - type: textarea
-    id: Screenshot
+    id: screenshot
     attributes:
       label: Screenshot
       description: |
-        If you feel a screenshot can say more than 1000 hard drives, do
-        please feel free to add it here :smiley:
+        Please add screenshot of the phishing site + impersonated domain
 
-        **INFO** There need to be at least one blank line separating before
-        and after the image line
-
-        Copy and paste the lines to the text area below.
-
-        ```
-        <details><summary>Click to expand</summary>
+        **INFO** There need to be at least one blank line separating before and after the image line
+        
+        Image posting code line `![Screenshot of phishing](https://full.link/to-image.ext)`
+      value: |
+        <details><summary>Screenshot, Phishing site</summary>
 
 
         </details>
-        ```
-      render: Markdown
-      placeholder: |
-        ```
-        <details><summary>Click to expand</summary>
+        
+        --------
+        
+        <details><summary>Screenshot, Impersonated site</summary>
 
-        ![Screenshot of phishing](https://full.link/to-image.ext)
 
         </details>
-        ```
     validations:
-      required: false
+      required: true
 
   - type: textarea
     attributes:
       label: Related external source
       description: |
-        If you have found your information in another fora, please paste
-        link here.
+        If you have found your information in another fora, please paste link here.
 
         One link per line.
       placeholder: |

.github/ISSUE_TEMPLATE/falsepositive.yml → .github/ISSUE_TEMPLATE/02-falsepositive.yml

@@ -8,24 +8,20 @@ body:
   - type: markdown
     attributes:
       value: |
-        We understand being listed on a Phishing Database like this can be
-        frustrating and embarrassing for many web site owners.
+        We understand being listed on a Phishing Database like this can be frustrating and embarrassing for many web site owners.
 
         The first step is to remain calm.
         
-        The second step is to rest assured one of our maintainers will address
-        your issue as soon as possible.
+        The second step is to rest assured one of our maintainers will address your issue as soon as possible.
 
-        Please make sure you have provided as much information and details as
-        possible to help speed up the processing of your whitelisting application.
+        Please make sure you have provided as much information and details as possible to help speed up the processing of your whitelisting application.
 
   - type: textarea
     id: FPrecord
     attributes:
       label: Domain/URL/IP(s) you believe NOT to be Phishing
       description: |
-        Please give us a list of FQDN (domains) or complete links (URI's) that
-        you believe to be false positives.
+        Please give us a list of FQDN (domains) or complete links (URI's) that you believe to be false positives.
         
         Please warn with "NSFW" where applicable.
       placeholder: |
@@ -36,31 +32,34 @@ body:
     validations:
       required: true
 
-  - type: checkboxes
+  - type: dropdown
     id: recordtype
+    validations:
+      required: true
     attributes:
       label: Whitelist type
       description: How do you believe the domain or uri should be whitelisted? More help can be found in the [README](https://github.com/mitchellkrogza/phishing#false-positives)
+      multiple: false
       options:
-        - label: '`1 to 1` match'
-          required: false
-        - label: '`ALL` subdomains or `REGEX`'
-          required: false
-        - label: '`RZD` all sub- and top level domains matching given record(s)'
-          required: false
+        - '`1 to 1` match'
+        - '`ALL` subdomains or `REGEX`'
+        - '`RZD` all sub- and top level domains matching given record(s)'
 
-  - type: checkboxes
+  - type: dropdown
     id: source
+    validations:
+      required: true
     attributes:
       label: More Information
       description: |
         How did you discover your IP-address or domain was listed in the Phishing or Phishing.Database?
+      multiple: true
       options:
-        - label: Website was hacked
-        - label: Phishtank
-        - label: OpenPhish
-        - label: VirusTotal
-        - label: Other (Please fill out the next box)
+        - Website was hacked
+        - Phishtank
+        - OpenPhish
+        - VirusTotal
+        - Other (Please fill out the next box)
 
   - type: textarea
     id: ifOther
@@ -70,7 +69,6 @@ body:
         Please let us know where you found this if not listed above. (One link per line.)
       placeholder: |
         https://example.org
-      render: Markdown
     validations:
       required: false
 
@@ -79,32 +77,20 @@ body:
     attributes:
       label: Screenshot
       description: |
-        If you feel a screenshot can say more than 1000 hard drives, do
-        please feel free to add it here :smiley:
+        If you feel a screenshot can say more than the words on 1000 hard drives, do please feel free to add it here :smiley:
 
-        **INFO** There need to be at least one blank line separating before
-        and after the image line
-
-        Copy and paste the lines to the text area below and paste the image link between the lines.
-
-        ```
-        <details><summary>Click to expand</summary>
-        
+        **INFO** There need to be at least one blank line separating before and after the image line
+      value: |
+        <details><summary>Screenshot, Phishing site</summary>
         
-        </details>
-        ```
-      placeholder: |
-        ```
-        <details><summary>Click to expand</summary>
-
-        ![Screenshot of phishing](https://full.link/to-image.ext)
         
         </details>
-        ```
     validations:
       required: false
 
   - type: textarea
+    validations:
+      required: false
     attributes:
       label: Additional context
       value: Add any other context about the problem here.

.github/workflows/master.yml

@@ -19,10 +19,10 @@ jobs:
       - name: Checkout the repo
         uses: actions/checkout@main
 
-      - name: Setup Python 3.11
+      - name: Setup Python 3.12
         uses: actions/setup-python@v5
         with:
-          python-version: 3.11
+          python-version: 3.12
 
       - name: Install requirements
         run: |

.gitignore

@@ -1,2 +1,94 @@
 .pyfunceble/.pyfunceble-env
-.idea/**
+
+# VSCode (Visual Basic Code)
+**.code-workspace
+no-git/**
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+!.vscode/*.code-snippets
+
+# Local History for Visual Studio Code
+.history/
+
+# Built Visual Studio Code Extensions
+*.vsix
+
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# AWS User-specific
+.idea/**/aws.xml
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/artifacts
+# .idea/compiler.xml
+# .idea/jarRepositories.xml
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+# *.iml
+# *.ipr
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# SonarLint plugin
+.idea/sonarlint/
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser

.pyfunceble/.pyfunceble-env.example

@@ -0,0 +1,12 @@
+# Copy this file as .pyfunceble/.pyfunceble-env and fill out the fields
+PYFUNCEBLE_DB_CHARSET=utf8mb4
+PYFUNCEBLE_DB_HOST=
+PYFUNCEBLE_DB_NAME=
+PYFUNCEBLE_DB_PASSWORD=''
+PYFUNCEBLE_DB_PORT=
+PYFUNCEBLE_DB_USERNAME=
+PYFUNCEBLE_OUTPUT_LOCATION=
+PYFUNCEBLE_PLATFORM_API_URL=https://api.beta.dead-hosts.com
+PYFUNCEBLE_PLATFORM_API_TOKEN=""
+PYFUNCEBLE_AUTO_CONFIGURATION=yes
+PYFUNCEBLE_PLATFORM_CHECKER_EXCLUDE=