minetest/contentdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow unlimited API tokens in GitHub webhooks

Browse Source
This commit is contained in:
rubenwardy 2020-04-11 15:24:44 +01:00
parent 39881e0d04
commit 0087c1ef9d
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/blueprints/github/__init__.py
View File

@ -20,7 +20,7 @@ bp = Blueprint("github", __name__)
from flask import redirect, url_for, request, flash, abort, render_template, jsonify, current_app from flask import redirect, url_for, request, flash, abort, render_template, jsonify, current_app
from flask_user import current_user, login_required from flask_user import current_user, login_required
from sqlalchemy import func from sqlalchemy import func, or_, and_
from flask_github import GitHub from flask_github import GitHub
from app import github, csrf from app import github, csrf
from app.models import db, User, APIToken, Package, Permission from app.models import db, User, APIToken, Package, Permission
@ -95,7 +95,10 @@ def webhook():
return error(400, "Could not find package, did you set the VCS repo in CDB correctly?") return error(400, "Could not find package, did you set the VCS repo in CDB correctly?")
# Get all tokens for package # Get all tokens for package
possible_tokens = APIToken.query.filter_by(package=package).all() tokens_query = APIToken.query.filter(or_(APIToken.package==package,
and_(APIToken.package==None, APIToken.owner==package.author)))
possible_tokens = tokens_query.all()
actual_token = None actual_token = None
# #
@ -118,7 +121,7 @@ def webhook():
break break
if actual_token is None: if actual_token is None:
return error(403, "Invalid authentication, couldn't validate API token. Make sure to limit token to a package") return error(403, "Invalid authentication, couldn't validate API token")
if not package.checkPerm(actual_token.owner, Permission.APPROVE_RELEASE): if not package.checkPerm(actual_token.owner, Permission.APPROVE_RELEASE):
return error(403, "Only trusted members can use webhooks") return error(403, "Only trusted members can use webhooks")