From b8449a0bd4f4911a0d69273d5f041535e74b75e5 Mon Sep 17 00:00:00 2001
From: syed abuthahir <developerabu@gmail.com>
Date: Fri, 30 Aug 2019 19:49:06 +0530
Subject: [PATCH] Implement Bucketnamelist

---
 .DS_Store        | Bin 8196 -> 8196 bytes
 README.md        |  38 ++++++++++++++++++++++++++++----------
 kicks3/kicks3.py |   9 +++++++--
 setup.py         |   2 +-
 4 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 9a1854bb0d96c378d3d9fb4f56ddb138b2311f4c..a23cecf275fb8f0697090efd25f657f2cdefcf63 100644
GIT binary patch
delta 474
zcmZp1XmOa}&#1I9U^hRb(qtY1so0o21_lNe20ey!hD?T%+<X_8q@4UDpcsdAoyw8A
z?t_k~@+o-b3o;CYlk;;6fO>$YUYOi0;Lc>?I{A!%6l?h#ZN2)*uLWeGEMCE6d8;2_
z!&87(7o%FfeTxoIb-$oAD}=RPP}Vg7WT+6(p{Wcd47v<S45bXo4B1d#B9NT}^hOCo
z1w)BvPJS}f8v;N*)(i}c9RI<9Ve(nQrL5cQG=QeB7gC=*PlyN3t7AMdSx>k@L%h1$
z%veXk%&=BRq1w>c++0V&!qBX?mXkwV)zH>6A-A%sx~8^n#^kHQ@{BVle-)NjJ`S{n
z4d|9ku#1WrjFAIU=G^?Pb={NAMda9^%xIB?qFf9?46Y203@!}5K)Md-^jwCN$?>A{
blmCb~Y_1axV%p3u@ttMzP7!B<YW<l2fgOY@

delta 412
zcmZp1XmOa}&#1UDU^hRb;$$8HsaTT+1_lNe20ey!hD?T%+<X_8q@4UDpcn^pm%Y@^
zu7i%K@+o-b3o;CYlk;;6fO;4hm_JNz7I0@WJU{u2fE24v9$&8C<kteSP!_LXvb<(L
z*zgpf)y1fmS5@)@Rrd=@vqD(w1!WlxCJPEJWlb~V0m|$aGKRC%Crb&3GajE@B;24b
zR$Xmws-s|LS*xQ^ZEkL$qhMiRQCrK&A+Bm@>zR;SSyf$ATQ_~Ol!!dzjLB9&GIMg2
zhzwg~%WcKWU6X4><k$|&Cw!mPHF<%^!pWtg4$6W+rx`QEGbAyTG9)u(Go&(<0C@#K
mUJ@|Wl7X^ilfy*iH*XaUVwzZBzL{O(JImy9Q9BYfng9SytZzL4

diff --git a/README.md b/README.md
index 4813353..4f1a827 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,23 @@
 # kicks3
-S3 bucket finder from html,js and bucket misconfiguration testing tool
+
+S3 bucket finder from html,js and bucket misconfiguration testing tool.
+
+Currently this tool check three testcases
+
+1. Object listing for Unauthenticated users
+
+2. Object listing for Authenticated users
+
+3. Public writable for all aws users
 
 pip install awscli
 
 aws configure
 
+### get your aws keys from aws console
 
 # Installation
 
-
 pip install kick-s3
 
 
@@ -18,28 +27,37 @@ git clone https://github.com/abuvanth/kicks3.git
 
 cd kicks3
 
-pip install -r requirements.txt
+python setup.py install
 
 ## Usage
 
 # single target
 
-python kicks3.py -u http://target
+ kicks3.py -u http://target
+ 
+ this will looking for s3 buckets in html and javascript files.
 
-# list of target 
+# Single Bucket 
 
-python kicks3.py -u http://target -l sitelist.txt
+ kicks3.py -b bucketname
+ 
+ test single bucket name
 
-# authenticated page
+# Bucket list
 
+ kicks3.py -bl bucketnamelist.txt
 
-python kicks3.py -u http://target -c 'cookievalues'
+# list of websites 
 
+ kicks3.py -u http://target -l sitelist.txt
+
+# authenticated page
 
+ kicks3.py -u http://target -c 'cookievalues'
 
 # subdomains
 
-python kicks3.py -u target.com -s 1
+ kicks3.py -u target.com -s 1
 
 
 # Use kicks3 as a module
@@ -55,7 +73,7 @@ for result in scan_result:
     print(result)#bucketname(testname),listable_for_unauth_users(true or false),listable_auth_users(true or false),writable(true or false)
 ```
 
-# buckets from textfile
+# buckets from text file
 
 ```
 import kicks3
diff --git a/kicks3/kicks3.py b/kicks3/kicks3.py
index 2bcb068..fc2a09c 100644
--- a/kicks3/kicks3.py
+++ b/kicks3/kicks3.py
@@ -134,12 +134,13 @@ def finds3(sitelist,cookies='',sub=0):
    ap = argparse.ArgumentParser()
    ap.add_argument("-u", "--url", required=False,help="Please enter target Url start with http or https")
    ap.add_argument("-b", "--bucket", required=False,help="Please enter Bucketname")
+   ap.add_argument("-bl", "--bucketlist", required=False,help="Bucketname List")
    ap.add_argument("-c", "--cookie", required=False,help="Paste ur cookie values for authentication purpose")
    ap.add_argument("-l", "--list", required=False,help="list of sites for testing Eg. sitelist.txt")
    ap.add_argument("-s", "--subdomain", required=False,help=" True or False")
    args = vars(ap.parse_args())
-   if args['url']==None and args['bucket']==None:
-      print('please give input like bucketname or url')
+   if args['url']==None and args['bucket']==None and args['bucketlist']==None:
+      print('please give input like -b bucketname  or -u url or -bl bucketnamelist.txt')
       exit()
    sitelist=[]
    cookies=''
@@ -158,6 +159,10 @@ def finds3(sitelist,cookies='',sub=0):
          print(results[0])
    if args['bucket']:
       results=scan_s3(args['bucket'],silent=True)
+   if args['bucketlist']:
+      bucket_list=open(args['bucketlist'],'r').readlines()
+      results=scan_s3(bucket_list,silent=True)
+      
    for i in results:
        print("Bucket name: "+i[0])
        if i[1]:
diff --git a/setup.py b/setup.py
index f573433..3d7d026 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
         install_requires = f.read().splitlines()
 setuptools.setup(
     name="kick-s3",
-    version="2.0.1",
+    version="2.0.2",
     author="Syed Abuthahir",
     author_email="developerabu@gmail.com",
     description="Recon tool",