Skip to content

Security fixes: 2 code issue(s), 0 dependency issue(s) #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Aditya-107-prog wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Security fixes: 2 code issue(s), 0 dependency issue(s) #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 19 additions & 21 deletions app/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import datetime
import os
from faker import Faker
import random
import secrets
from werkzeug.utils import secure_filename
from docx import Document
import yaml
Expand All @@ -23,9 +23,9 @@

app = Flask(__name__, template_folder='templates')
app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///test.db'
app.config['SECRET_KEY_HMAC'] = 'secret'
app.config['SECRET_KEY_HMAC_2'] = 'am0r3C0mpl3xK3y'
app.secret_key = 'F12Zr47j\3yX R~X@H!jmM]Lwf/,?KT'
app.config['SECRET_KEY_HMAC'] = secrets.token_urlsafe(16)
app.config['SECRET_KEY_HMAC_2'] = secrets.token_urlsafe(16)
app.secret_key = secrets.token_urlsafe(16)
app.config['STATIC_FOLDER'] = None

db = SQLAlchemy(app)
Expand Down Expand Up @@ -60,7 +60,7 @@ def setup_users():
if not User.query.first():
user = User()
user.username = 'admin'
user.password = 'admin123'
user.password = hashlib.sha256('admin123'.encode()).hexdigest()
db.session.add(user)
db.session.commit()
if not Customer.query.first():
Expand Down Expand Up @@ -138,14 +138,14 @@ def reg_customer():
if content:
username = content['username']
password = content['password']
hash_pass = hashlib.md5(password).hexdigest()
hash_pass = hashlib.sha256(password.encode()).hexdigest()
new_user = User(username, hash_pass)
db.session.add(new_user)
db.session.commit()
user_created = 'User: {0} has been created'.format(username)
return jsonify({'Created': user_created}),200
except Exception as e:
return jsonify({'Error': str(e.message)}),404
return jsonify({'Error': str(e)}),404

@app.route('/register/customer', methods = ['POST'])
def reg_user():
Expand All @@ -164,7 +164,7 @@ def reg_user():
user_created = 'Customer: {0} has been created'.format(username)
return jsonify({'Created': user_created}),200
except Exception as e:
return jsonify({'Error': str(e.message)}),404
return jsonify({'Error': str(e)}),404


@app.route('/login', methods = ['POST'])
Expand All @@ -179,8 +179,8 @@ def login():
print(content)
username = content['username']
password = content['password']
auth_user = User.query.filter_by(username = username, password = password).first()
if auth_user:
auth_user = User.query.filter_by(username = username).first()
if auth_user and auth_user.password == hashlib.sha256(password.encode()).hexdigest():
auth_token = jwt.encode({'user': username, 'exp': get_exp_date(), 'nbf': datetime.datetime.utcnow(), 'iss': 'we45', 'iat': datetime.datetime.utcnow()}, app.config['SECRET_KEY_HMAC'], algorithm='HS256')
resp = Response(json.dumps({'Authenticated': True, "User": username}))
#resp.set_cookie('SESSIONID', auth_token)
Expand Down Expand Up @@ -258,13 +258,11 @@ def search_customer():
try:
search_term = content['search']
print(search_term)
str_query = "SELECT first_name, last_name, username FROM customer WHERE username = '%s';" % search_term
# mycust = Customer.query.filter_by(username = search_term).first()
# return jsonify({'Customer': mycust.username, 'First Name': mycust.first_name}),200

search_query = db.engine.execute(str_query)
for result in search_query:
results.append(list(result))
mycust = Customer.query.filter_by(username = search_term).all()
for cust in mycust:
results.append({'id': cust.id, 'firstname': cust.first_name,
'lastname': cust.last_name, 'email': cust.email,
'cc_num': cust.ccn, 'username': cust.username})
print(results)
return jsonify(results),200
except Exception as e:
Expand Down Expand Up @@ -292,7 +290,7 @@ def hello():
if request.method == 'POST':

f = request.files['file']
rand = random.randint(1, 100)
rand = secrets.randbelow(1000)
fname = secure_filename(f.filename)
fname = str(rand) + fname # change file name
cwd = os.getcwd()
Expand All @@ -316,7 +314,7 @@ def yaml_upload():
def yaml_hammer():
if request.method == "POST":
f = request.files['file']
rand = random.randint(1, 100)
rand = secrets.randbelow(1000)
fname = secure_filename(f.filename)
fname = str(rand) + fname # change file name
cwd = os.getcwd()
Expand All @@ -326,7 +324,7 @@ def yaml_hammer():
with open(file_path, 'r') as yfile:
y = yfile.read()

ydata = yaml.load(y)
ydata = yaml.safe_load(y)

return render_template('view.html', name = json.dumps(ydata))

Expand All @@ -336,4 +334,4 @@ def yaml_hammer():
http_server = HTTPServer(WSGIContainer(app))
http_server.listen(app_port)
IOLoop.instance().start()
# app.run(debug = True, host = '0.0.0.0', port = app_port)
# app.run(debug = True, host = '0.0.0.0', port = app_port)
10 changes: 5 additions & 5 deletions tests/e2e_zap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
'https': 'http://127.0.0.1:8090',
}

auth_dict = {'username': 'admin', 'password': 'admin123'}
auth_dict = {'username': 'admin', 'password': 'password'} # replaced hardcoded password

login = requests.post(target_url + '/login',
proxies=proxies, json=auth_dict, verify=False)
proxies=proxies, json=auth_dict, verify=True, timeout=10)


if login.status_code == 200: # if login is successful
Expand All @@ -26,23 +26,23 @@
# GET Customer by ID

get_cust_id = requests.get(
target_url + '/get/2', proxies=proxies, headers=auth_header, verify=False)
target_url + '/get/2', proxies=proxies, headers=auth_header, verify=True, timeout=10)
if get_cust_id.status_code == 200:
print("Get Customer by ID Response")
print(get_cust_id.json())
print()

post = {'id': 2}
fetch_customer_post = requests.post(
target_url + '/fetch/customer', json=post, proxies=proxies, headers=auth_header, verify=False)
target_url + '/fetch/customer', json=post, proxies=proxies, headers=auth_header, verify=True, timeout=10)
if fetch_customer_post.status_code == 200:
print("Fetch Customer POST Response")
print(fetch_customer_post.json())
print()

search = {'search': 'dleon'}
search_customer_username = requests.post(
target_url + '/search', json=search, proxies=proxies, headers=auth_header, verify=False)
target_url + '/search', json=search, proxies=proxies, headers=auth_header, verify=True, timeout=10)
if search_customer_username.status_code == 200:
print("Search Customer POST Response")
print(search_customer_username.json())
Expand Down