minor code change

greyshell · greyshell · commit 7121cc5e101a · 2021-04-07T02:15:37.000-04:00
diff --git a/miscellaneous/csv_update/csv_update.py b/miscellaneous/csv_update/csv_update.py
@@ -8,7 +8,7 @@
 import pandas as pd
 
 
-class UserInput:
+class MyUtils:
     def __init__(self):
         self.parser = argparse.ArgumentParser(
             description="csv update")
@@ -45,7 +45,7 @@ def auto_triage(master_csv, month_csv, output_csv):
 
 
 if __name__ == "__main__":
-    my_input = UserInput()
+    my_input = MyUtils()
     args = my_input.parser.parse_args()
 
     if len(sys.argv) == 1:
diff --git a/utils/create_blog/README.md b/utils/create_blog/README.md
@@ -1,13 +1,13 @@
 ## Description
 
-`octo_prepare.py` is used to generate posts for `Greyshell's Diary`.
+`create_blog.py` is used to generate posts for my `Greyshell's Diary`.
 
 ### How to use
 
 1. write down notes in `markdown` format.
 2. when you paste a image, it gets stored inside the filename.assets folder.
 3. If that note needs to be published then set `comments: true` and set a categories like `categories: windows-exploit-dev`.
-    - Available categories: windows-exploit-dev, linux-exploit-dev, web-security, network-security, capture-the-flag
+    - Available categories: `windows-exploit-dev`, `linux-exploit-dev`, `web-security`, `network-security`, `capture-the-flag`
 4. use markdown preview for `view only` mode.
 5. how to include / show the content of a .txt file: create a `.py` file and copy the content inside the multiline comment section.
 6. how to use python code: copy the python file into the `octopress/source/artifacts/<filename>.assets` folder directly.
@@ -25,7 +25,7 @@
 
 ### Usage
 ```
-usage: octo_prepare.py [-h] -c
+usage: create_blog.py [-h] -c
 
 create blog posts for octopress
 
diff --git a/utils/create_blog/config.json b/utils/create_blog/config.json
@@ -0,0 +1,9 @@
+{
+  "src_dir": "/Users/abhijitsinha/Dropbox/grey_diary/",
+  "dst_dir": "/Users/abhijitsinha/Dropbox/octopress/source/_posts/",
+  "publish_flag": "true",
+  "blacklisted_dirs": [".git", ""],
+  "whitelisted_filetypes": [".md", ".markdown"],
+  "skipped_files": [".py", ".txt", ".java", ".c",".cpp", ".js"],
+  "platform": "mac"
+}
diff --git a/utils/create_blog/create_blog.py b/utils/create_blog/create_blog.py
@@ -11,12 +11,12 @@
 import sys
 
 
-class UserInput:
+class MyUtils:
     def __init__(self):
         self.parser = argparse.ArgumentParser(
-            description="create blog posts for octopress")
+                description="create blog posts for octopress")
         self.parser.add_argument(
-            "-c", "--config", metavar="", help="provide a .json file", required=True)
+                "-c", "--config", metavar="", help="provide a .json file", required=True)
 
 
 class Octopress:
@@ -143,11 +143,10 @@ def process_markdown(self):
                         continue
 
                     if date != "" and comments == "true":
-                        print(f"[x] {file} => comment : true")
                         # remove unused images
                         asset_dir = root + "/" + name + ".assets/"
                         self._remove_unused_image(
-                            asset_dir, absolute_file_path, self._skipped_files)
+                                asset_dir, absolute_file_path, self._skipped_files)
 
                         # prepare the file name
                         new_file_name = date + "-" + name.replace('_', '-') + ".markdown"
@@ -196,7 +195,7 @@ def process_markdown(self):
 
 
 if __name__ == "__main__":
-    my_input = UserInput()
+    my_input = MyUtils()
     args = my_input.parser.parse_args()
 
     if len(sys.argv) == 1:
diff --git a/utils/creds_manager/creds_manager.py b/utils/creds_manager/creds_manager.py
@@ -10,7 +10,7 @@
 import keyring
 
 
-class UserInput:
+class MyUtils:
     def __init__(self):
         self.parser = argparse.ArgumentParser(
                 description="a helper script / wrapper to perform all keyring operations")
@@ -64,7 +64,7 @@ def del_keyring(keyring_name):
 
 
 if __name__ == "__main__":
-    my_input = UserInput()
+    my_input = MyUtils()
     args = my_input.parser.parse_args()
 
     if len(sys.argv) == 1:
diff --git a/utils/lab_vpn/lab_vpn.py b/utils/lab_vpn/lab_vpn.py
@@ -23,7 +23,7 @@
 """
 
 
-class UserInput:
+class MyUtils:
     def __init__(self):
         self.parser = argparse.ArgumentParser(
                 description="automate the openvpn lab connection")
@@ -156,7 +156,7 @@ def lab_connection(self):
 
 
 if __name__ == "__main__":
-    my_input = UserInput()
+    my_input = MyUtils()
     args = my_input.parser.parse_args()
 
     if len(sys.argv) == 1:
diff --git a/utils/octo_prepare/config.json b/utils/octo_prepare/config.json
diff --git a/web/dblib/mysql_db.py b/web/dblib/mysql_db.py
@@ -4,7 +4,7 @@
 # description: setup mysql db connection
 
 import mysql.connector
-import keyring
+import os
 
 
 class MySQLdb:
@@ -16,10 +16,19 @@ def __init__(self):
             """
             create a database connection for MySQL database
             """
+            try:
+                import keyring
+                username = keyring.get_password('mysql', 'username')
+                password = keyring.get_password('mysql', 'password')
+            except ImportError as err:
+                print(f"inside the container: {err}")
+                username = os.environ.get("username")
+                password = os.environ.get("password")
+
             try:
                 # pick database credentials from keyring
-                self.conn = mysql.connector.connect(user=keyring.get_password('mysql', 'username'),
-                                                    password=keyring.get_password('mysql', 'password'),
+                self.conn = mysql.connector.connect(user=username,
+                                                    password=password,
                                                     host='localhost',
                                                     database='vulnapp')
 
diff --git a/web/sqli/app.py b/web/sqli/app.py
@@ -7,7 +7,7 @@
 import string
 from flask import Flask, render_template
 from flask import request
-from web.sqli.models import *
+from models import *
 from mysql_db import MySQLdb
 
 templates_path = os.path.abspath(
@@ -18,7 +18,8 @@
 
 @app.before_request
 def before_request_func():
-    MySQLdb()  # create database
+    # create the database
+    MySQLdb(host="localhost", db_name="vulnapp")
 
 
 @app.after_request
@@ -86,4 +87,4 @@ def tbl_post03():
 
 
 if __name__ == '__main__':
-    app.run(port=9000, debug=True)
+    app.run(host='0.0.0.0', port=9000, debug=True)
diff --git a/web/sqli/db_house-keeping/db_clean-up.sql b/web/sqli/db_house-keeping/db_clean-up.sql
diff --git a/web/sqli/db_house-keeping/db_drop.sql b/web/sqli/db_house-keeping/db_drop.sql
diff --git a/web/sqli/db_house-keeping/db_setup.sql b/web/sqli/db_house-keeping/db_setup.sql
@@ -12,9 +12,9 @@ comment VARCHAR(30) NOT NULL,
 user VARCHAR(10) NOT NULL
 );
 
-INSERT INTO vulnapp.tbl_post01 (comment, user) VALUES ('hola', 'pedro');
-INSERT INTO vulnapp.tbl_post01 (comment, user) VALUES ('hi', 'usman');
-INSERT INTO vulnapp.tbl_post01 (comment, user) VALUES ('ola', 'amol');
+INSERT INTO vulnapp.tbl_post01 (comment, user) VALUES ('hola', 'bob');
+INSERT INTO vulnapp.tbl_post01 (comment, user) VALUES ('hi', 'tom');
+INSERT INTO vulnapp.tbl_post01 (comment, user) VALUES ('ola', 'mut');
 
 
 # case02:
diff --git a/web/sqli/models/__init__.py b/web/sqli/models/__init__.py
@@ -2,6 +2,6 @@
 
 # author: greyshell
 
-from tblpost01 import *
-from tblpost02 import *
-from tblpost03 import *
+from .tblpost01 import *
+from .tblpost02 import *
+from .tblpost03 import *
diff --git a/web/sqli/models/tblpost01.py b/web/sqli/models/tblpost01.py
@@ -2,12 +2,15 @@
 
 # author: greyshell
 
+import sys
+
+sys.path.append("..")
 from mysql_db import MySQLdb
 
 
 class TblPost01:
     def __init__(self):
-        self.db = MySQLdb()
+        self.db = MySQLdb(host="localhost", db_name="vulnapp")
 
     def unsafe_select_query(self, user):
         # creating the cursor
diff --git a/web/sqli/models/tblpost02.py b/web/sqli/models/tblpost02.py
@@ -2,12 +2,14 @@
 
 # author: greyshell
 
+import sys
+sys.path.append("..")
 from mysql_db import MySQLdb
 
 
 class TblPost02:
     def __init__(self):
-        self.db = MySQLdb()
+        self.db = MySQLdb(host="localhost", db_name="vulnapp")
 
     def unsafe_insert_query(self, comment, pin, age, user):
         # create the cursor
diff --git a/web/sqli/models/tblpost03.py b/web/sqli/models/tblpost03.py
@@ -2,12 +2,15 @@
 
 # author: greyshell
 
+import sys
+sys.path.append("..")
+
 from mysql_db import MySQLdb
 
 
 class TblPost03:
     def __init__(self):
-        self.db = MySQLdb()
+        self.db = MySQLdb(host="localhost", db_name="vulnapp")
 
     def unsafe_insert_query(self, comment, city, age, user):
         # create the cursor
diff --git a/web/sqli/template/case01.html b/web/sqli/template/case01.html
@@ -19,7 +19,7 @@ <h2>SQL Injection</h2>
 <i>author: greyshell</i><br><br>
 Objective: extract admin's password and token <br><br>
 <form method="POST">
-    Enter a user (e.g. usman, pedro, amol) to view his comments:
+    Enter a user (e.g. bob, tom, mut) to view his comments:
     <br><br>
     <label>
         <input type="text" name="user" size=100/>
diff --git a/web/xss/db_house-keeping/db_drop.sql b/web/xss/db_house-keeping/db_drop.sql
@@ -1,6 +1,6 @@
 # author: greyshell
 # description: drop all tables an db
-# usage: mysql -u root --password=<pass> < db_drop.sql
+# usage: mysql -u root --password=<pass> < drop_tbls.sql
 # lab: xss
 
 DROP TABLE vulnapp.tbl_users;
