[aur-dev] [PATCH v3 3/5] git-auth: Set AUR_PRIVILEGED env var for TUs & devs

[Lukas Fleischer]

On Tue, 23 Jun 2015 at 12:26:36, Johannes Löthberg wrote:
> Signed-off-by: Johannes Löthberg <johannes at kyriasis.com>
> ---
>  git-interface/git-auth.py | 11 +++++++++--
>  1 file changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/git-interface/git-auth.py b/git-interface/git-auth.py
> index f355332..fd93cf4 100755
> --- a/git-interface/git-auth.py
> +++ b/git-interface/git-auth.py
> @@ -46,18 +46,25 @@ db = mysql.connector.connect(host=aur_db_host, user=aur_db_user,
>                               unix_socket=aur_db_socket, buffered=True)
>  
>  cur = db.cursor()
> -cur.execute("SELECT Username FROM Users WHERE SSHPubKey = %s " +
> +cur.execute("SELECT Username, AccountTypeID FROM Users WHERE SSHPubKey = %s " +
>              "AND Suspended = 0", (keytype + " " + keytext,))
>  
>  if cur.rowcount != 1:
>      exit(1)
>  
> -user = cur.fetchone()[0]
> +user, account_type = cur.fetchone()[0]

You also need to drop the "[0]" here.

>  if not re.match(username_regex, user):
>      exit(1)
>  
> +
> +if account_type > 1:
> +    privileged = True
> +else:
> +    privileged = False
> +
>  env_vars = {
>      'AUR_USER': user,
> +    'AUR_PRIVILEGED': privileged,

Unfortunately, this doesn't work. You cannot simply pass boolean values
like this. How about

    'AUR_PRIVILEGED': '1' if account_type > 1 else '0',

instead? You'd also need to fix 5/5 and obtain the value via

    (os.environ.get("AUR_PRIVILEGED") == '1')

or something similar.

Thanks!

>  }
>  key = keytype + ' ' + keytext
>  
> -- 
> 2.4.4