simplify "format_list" structure

clarketm · Feb 9, 2019 · 7a87a93 · 7a87a93
1 parent d36b83a
commit 7a87a93
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/s3recon/constants.py b/s3recon/constants.py
@@ -4,10 +4,10 @@
 public_text = "PUBLIC"
 
 format_list = [
-    "https://s3{region}.amazonaws.com/{word}{sep}{env}",
-    "https://s3{region}.amazonaws.com/{env}{sep}{word}",
-    # "https://{word}{sep}{env}.s3{region}.amazonaws.com",
-    # "https://{env}{sep}{word}.s3{region}.amazonaws.com",
+    "https://{region}.amazonaws.com/{word}{sep}{env}",
+    "https://{region}.amazonaws.com/{env}{sep}{word}",
+    # "https://{word}{sep}{env}.{region}.amazonaws.com",
+    # "https://{env}{sep}{word}.{region}.amazonaws.com",
 ]
 
 useragent_list = [

diff --git a/s3recon/s3recon.py b/s3recon/s3recon.py
@@ -112,7 +112,7 @@ def main(words, timeout, output, only_public):
 
     url_list = {
         f.format(
-            region=f".{region}" if region else "",
+            region=f"s3.{region}" if region else "s3",
             word=word,
             sep=sep if env else "",
             env=env,