Merge branch 'master' into sync

.bin/get-and-patch-readme-repository-details.py

@@ -7,51 +7,51 @@
 
 print("[+] Readme stats updater")
 
+# Constants
+CONNECTION_SPEED_MBPS = 50  # Change this to set a different cloning speed (in Mbps)
 REPOSITORY_API="https://api.github.com/repos/%s"
 REPOSITORY="danielmiessler/SecLists"
-DETAILS_ANCHOR="<!--- details anchor -->"
-DETAILS_ANCHOR_REGEX=r"%s.*?%s"%(DETAILS_ANCHOR,DETAILS_ANCHOR)
-COMMIT_MESSAGE="[Github Action] Automated readme update."
-DETAIL_USER_NOTICE_STRING="""%s
-
-### Repository details
-
-Size of a complete clone of SecLists is currently at `%s`
-
-Cloning this repository should take %i-%i minutes at 5MB/s speeds.
-
-%s"""
+BADGE_REGEX=r"!\[Approx cloning time\]\(https://img\.shields\.io/badge/.*?\)"
+BADGE_TEMPLATE = f"![Approx cloning time](https://img.shields.io/badge/clone%%20time-~%%20%s%%20@%dMb/s-blue)"
 ERROR_STRING="::error file=%s,line=%s,col=%s,endColumn=%s::%s"
 
 def print_err(file,msg,line=1,col=1,endcol=1):
     print(ERROR_STRING%(file,line,col,endcol,msg))
 
 size=requests.get(REPOSITORY_API%(REPOSITORY)).json()['size'] # Its in kb
 
-suffixes=['MB','GB','TB']
-final_size=[str(size),"","KB"]
+# Calculate size in MB
+size_mb = Decimal(size) / 1024
 
-for i in suffixes:
-    if len(final_size[0])>3:
-
-        final_size[1]=final_size[0][-3:]+final_size[1]
-        final_size[0]=final_size[0][:-3]
-        final_size[2]=i
+# Calculate cloning time for the defined connection speed (convert size to bits)
+cloning_time_seconds = int((size_mb * 8) / CONNECTION_SPEED_MBPS)
 
-final_size="%s %s"%(str(round(Decimal('.'.join(final_size[:2])),1)),final_size[2])
+# Cloning time seconds to minutes and seconds
+minutes = cloning_time_seconds // 60
+seconds = cloning_time_seconds % 60
 
-eta_lower_bound=int(str(size/5000/60).split('.')[0]) # Get whole number after decimal point
-eta_upper_bound=eta_lower_bound+1
+if minutes > 0:
+    cloning_time = f"{minutes}m%20{seconds}s"
+else:
+    cloning_time = f"{seconds}s"
 
-DETAIL_USER_NOTICE_STRING=DETAIL_USER_NOTICE_STRING%(DETAILS_ANCHOR,final_size,eta_lower_bound,eta_upper_bound,DETAILS_ANCHOR)
+# New badge string
+approx_cloning_time_badge = BADGE_TEMPLATE % (cloning_time, CONNECTION_SPEED_MBPS)
 
 readme_contents=open("README.md").read()
 
-if not re.search(DETAILS_ANCHOR_REGEX,readme_contents,flags=re.DOTALL):
-    print_err("README.md", "[!] Error: No details anchor found!")
+if not re.search(BADGE_REGEX,readme_contents,flags=re.DOTALL):
+    print_err("README.md", "[!] Error: No approx cloning time badge found!")
     exit(2)
 
-readme_contents=re.sub(DETAILS_ANCHOR_REGEX,DETAIL_USER_NOTICE_STRING,readme_contents,count=1,flags=re.DOTALL)
-open("README.md","w").write(readme_contents)
+# Update the badge in the README.md content
+new_readme_content = re.sub(
+    BADGE_REGEX,
+    approx_cloning_time_badge,
+    readme_contents,
+    count=1
+)
+
+open("README.md","w").write(new_readme_content)
 
-print("[+] Wrote README.md!")
+print(f"[+] Updated README.md with new cloning time badge at {CONNECTION_SPEED_MBPS}Mb/s!")

.bin/wordlist-updaters/status.json

@@ -1,8 +1,8 @@
 {
     "Jwt secrets update": {
-        "last_update": 1734634998
+        "last_update": 1737745396
     },
     "Trickest wordlist update": {
-        "last_update": 1734602635
+        "last_update": 1737713049
     }
 }

.github/pull_request_template.md

@@ -1,19 +1,7 @@
----
-name: 'Pull request'
-about: 'Create a pull request to improve SecLists'
-title: '[Pull request]: '
-labels: 'enhancement'
-assignees: ''
-
----
-
 <!--- IMPORTANT --->
 <!--- Please make sure you've checked the CONTRIBUTING.md before creating a pull-request: https://github.com/danielmiessler/SecLists/blob/master/CONTRIBUTING.md -->
 <!--- IMPORTANT --->
 
-**Describe the added commits**
-<!--- A clear and concise description of what is being added to the repository. -->
-
 **Purpose of pull request**
 <!--- Tell us what made you decide to open a pull request. --->
 <!--- If you added a wordlist, describe what it could be used for --->
@@ -22,5 +10,5 @@ assignees: ''
 <!--- Put/link the source here. -->
 
 **Additional context**
-<!--- Add any other context about the problem/missing feature that you are fixing/solving here. 
-Tag the issue here if applicable. -->
+<!--- Add any other context about the problem/missing feature that you are fixing/solving here. -->
+<!--- Tag the issue here if applicable. -->

Discovery/DNS/README.md

@@ -1,29 +1,13 @@
-# DNS discovery wordlists
+## combined_subdomains
 
-## combined_subdomains.txt
-
-### Overview
 This wordlist is a combination of the following wordlists with a few subdomains added:
 - bitquark-subdomains-top100000.txt
 - shubs-subdomains.txt
 - subdomains-top1million-110000.txt
 
-### Usage
-Use for: discovering subdomains
-
-### Source
-This list is automatically updated by a GitHub action whenever any of the lists it's composed by is modified.
-
-## subdomains-top1million-110000.txt
-
-### Overview
-These wordlists were [zone-transferred from Amazon's Alexa.com](https://gist.github.com/ethicalhack3r/6145925) in 2015. They are lists of the most used subdomains at the time, as reported by Alexa.com.
-
-### Usage
-Use for: discovering subdomains
+## `subdomains-top1million-*`
 
-### Source
-Source: https://gist.github.com/ethicalhack3r/6145925
+> [!WARNING]
+> These wordlists are several years old, they were made in 2015. You will not be able to detect deployments of any services which were invented after 2015 using these wordlists, because their names will not be on the lists.
 
-### References
-- [Zone Transfer from Alexa.com](https://gist.github.com/ethicalhack3r/6145925)
+These wordlists were [zone-transfered from Amazon's Alexa.com](https://gist.github.com/ethicalhack3r/6145925) in 2015. They are lists of the most used subdomains at the time, as reported by Alexa.com.