-
Notifications
You must be signed in to change notification settings - Fork 1.9k
fix: Add access-control for admin-specific route #5942
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.
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
Merged
iamareebjamal
merged 1 commit into
fossasia:development
from
mrsaicharan1:cred-leak-fix
May 23, 2019
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,6 +4,8 @@ | |
| import string | ||
|
|
||
| import requests | ||
| from healthcheck import EnvironmentDump | ||
| from functools import wraps | ||
| from flask import request, jsonify, make_response, Blueprint, send_file, url_for, redirect | ||
| from flask_jwt import current_identity as current_user, jwt_required | ||
| from sqlalchemy.orm.exc import NoResultFound | ||
|
|
@@ -28,6 +30,7 @@ | |
| from app.api.helpers.storage import UPLOAD_PATHS | ||
|
|
||
|
|
||
| authorised_blueprint = Blueprint('authorised_blueprint', __name__, url_prefix='/') | ||
| ticket_blueprint = Blueprint('ticket_blueprint', __name__, url_prefix='/v1') | ||
| auth_routes = Blueprint('auth', __name__, url_prefix='/v1/auth') | ||
|
|
||
|
|
@@ -328,3 +331,36 @@ def order_invoices(order_identifier): | |
| return ForbiddenError({'source': ''}, 'Unauthorized Access').respond() | ||
| else: | ||
| return ForbiddenError({'source': ''}, 'Authentication Required to access Invoice').respond() | ||
|
|
||
|
|
||
| # Access for Environment details & Basic Auth Support | ||
| def check_auth_admin(username, password): | ||
| """ | ||
| This function is called to check for proper authentication & admin rights | ||
| """ | ||
| if username and password: | ||
| user = User.query.filter_by(_email=username).first() | ||
| if user: | ||
| if user.is_correct_password(password): | ||
| if user.is_admin: | ||
| return True | ||
| return False | ||
|
|
||
|
|
||
| def requires_basic_auth(f): | ||
| @wraps(f) | ||
| def decorated(*args, **kwargs): | ||
| auth = request.authorization | ||
| if not auth or not check_auth_admin(auth.username, auth.password): | ||
| return make_response('Could not verify your access level for that URL.\n' | ||
| 'You have to login with proper credentials', 401, | ||
| {'WWW-Authenticate': 'Basic realm="Login Required"'}) | ||
| return f(*args, **kwargs) | ||
| return decorated | ||
|
|
||
|
|
||
| @authorised_blueprint.route('/environment') | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. expected 2 blank lines, found 1 |
||
| @requires_basic_auth | ||
| def environment_details(): | ||
| envdump = EnvironmentDump(include_config=False) | ||
| return envdump.dump_environment() | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
expected 2 blank lines, found 1