external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Honor the database socket setting in Git scripts

Browse source 
Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2014-12-26 22:04:02 +01:00
parent e1aac98bf5
commit c3c110c09d
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scripts/git-integration/git-auth.py
View file

@ -12,6 +12,7 @@ aur_db_host = config.get('database', 'host')
aur_db_name = config.get('database', 'name') aur_db_name = config.get('database', 'name')
aur_db_user = config.get('database', 'user') aur_db_user = config.get('database', 'user')
aur_db_pass = config.get('database', 'password') aur_db_pass = config.get('database', 'password')
aur_db_socket = config.get('database', 'socket')
key_prefixes = config.get('auth', 'key-prefixes').split() key_prefixes = config.get('auth', 'key-prefixes').split()
username_regex = config.get('auth', 'username-regex') username_regex = config.get('auth', 'username-regex')
@ -25,7 +26,7 @@ if pubkey is None or not pubkey.startswith(valid_prefixes):
db = mysql.connector.connect(host=aur_db_host, user=aur_db_user, db = mysql.connector.connect(host=aur_db_host, user=aur_db_user,
passwd=aur_db_pass, db=aur_db_name, passwd=aur_db_pass, db=aur_db_name,
buffered=True) unix_socket=aur_db_socket, buffered=True)
cur = db.cursor() cur = db.cursor()
cur.execute("SELECT Username FROM Users WHERE SSHPubKey = %s " + cur.execute("SELECT Username FROM Users WHERE SSHPubKey = %s " +

6
scripts/git-integration/git-serve.py
View file

@ -15,6 +15,7 @@ aur_db_host = config.get('database', 'host')
aur_db_name = config.get('database', 'name') aur_db_name = config.get('database', 'name')
aur_db_user = config.get('database', 'user') aur_db_user = config.get('database', 'user')
aur_db_pass = config.get('database', 'password') aur_db_pass = config.get('database', 'password')
aur_db_socket = config.get('database', 'socket')
repo_base_path = config.get('serve', 'repo-base') repo_base_path = config.get('serve', 'repo-base')
repo_regex = config.get('serve', 'repo-regex') repo_regex = config.get('serve', 'repo-regex')
@ -40,7 +41,8 @@ def setup_repo(repo, user):
die('invalid repository name: %s' % (repo)) die('invalid repository name: %s' % (repo))
db = mysql.connector.connect(host=aur_db_host, user=aur_db_user, db = mysql.connector.connect(host=aur_db_host, user=aur_db_user,
passwd=aur_db_pass, db=aur_db_name) passwd=aur_db_pass, db=aur_db_name,
unix_socket=aur_db_socket)
cur = db.cursor() cur = db.cursor()
cur.execute("SELECT COUNT(*) FROM PackageBases WHERE Name = %s ", [repo]) cur.execute("SELECT COUNT(*) FROM PackageBases WHERE Name = %s ", [repo])
@ -66,7 +68,7 @@ def setup_repo(repo, user):
def check_permissions(pkgbase, user): def check_permissions(pkgbase, user):
db = mysql.connector.connect(host=aur_db_host, user=aur_db_user, db = mysql.connector.connect(host=aur_db_host, user=aur_db_user,
passwd=aur_db_pass, db=aur_db_name, passwd=aur_db_pass, db=aur_db_name,
buffered=True) unix_socket=aur_db_socket, buffered=True)
cur = db.cursor() cur = db.cursor()
cur.execute("SELECT COUNT(*) FROM PackageBases INNER JOIN Users " + cur.execute("SELECT COUNT(*) FROM PackageBases INNER JOIN Users " +

3
scripts/git-integration/git-update.py
View file

@ -17,6 +17,7 @@ aur_db_host = config.get('database', 'host')
aur_db_name = config.get('database', 'name') aur_db_name = config.get('database', 'name')
aur_db_user = config.get('database', 'user') aur_db_user = config.get('database', 'user')
aur_db_pass = config.get('database', 'password') aur_db_pass = config.get('database', 'password')
aur_db_socket = config.get('database', 'socket')
def save_srcinfo(srcinfo, db, cur, user): def save_srcinfo(srcinfo, db, cur, user):
# Obtain package base ID and previous maintainer. # Obtain package base ID and previous maintainer.
@ -206,7 +207,7 @@ srcinfo = aurinfo.ParseAurinfoFromIterable(srcinfo_raw)
db = mysql.connector.connect(host=aur_db_host, user=aur_db_user, db = mysql.connector.connect(host=aur_db_host, user=aur_db_user,
passwd=aur_db_pass, db=aur_db_name, passwd=aur_db_pass, db=aur_db_name,
buffered=True) unix_socket=aur_db_socket, buffered=True)
cur = db.cursor() cur = db.cursor()
save_srcinfo(srcinfo, db, cur, user) save_srcinfo(srcinfo, db, cur, user)
db.close() db.close()