Prep for further PyPi/script fixes

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Change Log
 All notable changes to the Sandcastle script will be documented in this file.
 
+## 1.2.3 – 2017-04-09
+- Fixes minor issues with `setup.py` classifiers 
+- Fixes additional issue with default `bucket-names.txt` import
+- Removes "no match" display from Sandcastle script
+
 ## 1.2.2 – 2017-04-09
 - Sandcastle is now live on PyPi! This version fixes an import issue with `bucket-names.txt`.
 

MANIFEST

@@ -3,6 +3,7 @@ CHANGELOG.md
 LICENSE
 README.md
 README.rst
+bucket-names.txt
 sandcastle.py
 setup.cfg
 setup.py

sandcastle.py

@@ -9,16 +9,20 @@
  _\ \/ _ `/ _ \/ _  / __/ _ `(_-</ __/ / -_)
 /___/\_,_/_//_/\_,_/\__/\_,_/___/\__/_/\__/ 
                                             
-S3 bucket enumeration // release v1.2.2 // ysx
+S3 bucket enumeration // release v1.2.3 // ysx
 """
 # Receive – target stem and argument check
+_ROOT = os.path.abspath(os.path.dirname(__file__))
+def get_data(path):
+    return os.path.join(_ROOT, 'data', path)
+defaultFile = get_data('bucket-names.txt')
 targetStem = ""
 inputFile = ""
 parser = ArgumentParser()
 parser.add_argument("-t", "--target", dest="targetStem",
                     help="Select a target stem name (e.g. 'instacart')", metavar="targetStem", required="True")
 parser.add_argument("-f", "--file", dest="inputFile",
-                    help="Optional: select a bucket permutation file (default: bucket-names.txt)", default="bucket-names.txt", metavar="inputFile")
+                    help="Optional: select a bucket permutation file (default: bucket-names.txt)", default=defaultFile, metavar="inputFile")
 args = parser.parse_args()
 with open(args.inputFile, 'r') as f: 
     bucketNames = [line.strip() for line in f] 
@@ -31,6 +35,4 @@
 		print "[+] Match: %s%s --> %s" % (args.targetStem, name, r.status_code)
 	else:
 		sys.stdout.write('')
-		# Non-matching analysis disabled by default
-		# print "[-] No match: %s%s --> %s" % (args.targetStem, name, r.status_code)
 print "[+] Enumeration of '%s' complete." % (args.targetStem)

setup.py

@@ -1,18 +1,21 @@
 from distutils.core import setup
 setup(
   name = 'sandcastle',
-  version = '1.2.2',
+  version = '1.2.3',
   description = 'A Python script for AWS S3 bucket enumeration.',
   author = 'Yasin Soliman',
   author_email = '[email protected]',
   scripts=['sandcastle.py'],
   url = 'https://github.com/yasinS/sandcastle',
-  download_url = 'https://github.com/yasinS/sandcastle/archive/1.2.2.tar.gz',
+  download_url = 'https://github.com/yasinS/sandcastle/archive/1.2.3.tar.gz',
+  package_data={
+        'sandcastle': ['bucket-names.txt'],
+  },
   keywords = ['amazons3', 'infosec', 'bucket'],
-    classifiers=[
+  classifiers=[
         "License :: OSI Approved :: MIT License",
         "Development Status :: 5 - Production/Stable",
         "Topic :: Security",
-    ],
+  ],
 
 )