- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] git-serve.py: Relax path validation
by Lukas Fleischer 02 Jan '15

02 Jan '15

Make the terminating slash in repository URLs optional. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- scripts/git-integration/git-serve.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/git-integration/git-serve.py b/scripts/git-integration/git-serve.py index 3669a73..c81887b 100755 --- a/scripts/git-integration/git-serve.py +++ b/scripts/git-integration/git-serve.py @@ -26,9 +26,12 @@ ssh_cmdline = config.get('serve', 'ssh-cmdline') def repo_path_validate(path): if not path.startswith(repo_base_path): return False - if not path.endswith('.git/'): + if path.endswith('.git'): + repo = path[len(repo_base_path):-4] + elif path.endswith('.git/'): + repo = path[len(repo_base_path):-5] + else: return False - repo = path[len(repo_base_path):-5] return re.match(repo_regex, repo) def repo_path_get_pkgbase(path): -- 2.2.1

1 0

[aur-dev] [PATCH 1/2] git-serve.py: Improve error messages
by Lukas Fleischer 01 Jan '15

01 Jan '15

Also, add a help command that lists available options. Implements FS#43287. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- scripts/git-integration/git-serve.py | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/scripts/git-integration/git-serve.py b/scripts/git-integration/git-serve.py index 1dec6b4..64620a9 100755 --- a/scripts/git-integration/git-serve.py +++ b/scripts/git-integration/git-serve.py @@ -21,6 +21,7 @@ repo_base_path = config.get('serve', 'repo-base') repo_regex = config.get('serve', 'repo-regex') git_update_hook = config.get('serve', 'git-update-hook') git_shell_cmd = config.get('serve', 'git-shell-cmd') +ssh_cmdline = config.get('serve', 'ssh-cmdline') def repo_path_validate(path): if not path.startswith(repo_base_path): @@ -38,7 +39,7 @@ def repo_path_get_pkgbase(path): def setup_repo(repo, user): if not re.match(repo_regex, repo): - die('invalid repository name: %s' % (repo)) + die('%s: invalid repository name: %s' % (action, repo)) db = mysql.connector.connect(host=aur_db_host, user=aur_db_user, passwd=aur_db_pass, db=aur_db_name, @@ -47,12 +48,12 @@ def setup_repo(repo, user): cur.execute("SELECT COUNT(*) FROM PackageBases WHERE Name = %s ", [repo]) if cur.fetchone()[0] > 0: - die('package base already exists: %s' % (repo)) + die('%s: package base already exists: %s' % (action, repo)) cur.execute("SELECT ID FROM Users WHERE Username = %s ", [user]) userid = cur.fetchone()[0] if userid == 0: - die('unknown user: %s' % (user)) + die('%s: unknown user: %s' % (action, user)) cur.execute("INSERT INTO PackageBases (Name, SubmittedTS, ModifiedTS, " + "SubmitterUID) VALUES (%s, UNIX_TIMESTAMP(), " + @@ -81,21 +82,26 @@ def die(msg): sys.stderr.write("%s\n" % (msg)) exit(1) +def die_with_help(msg): + die(msg + "\nTry `%s help` for a list of commands." % (ssh_cmdline)) + user = sys.argv[1] cmd = os.environ.get("SSH_ORIGINAL_COMMAND") if not cmd: - die('no command specified') + die_with_help("Interactive shell is disabled.") cmdargv = shlex.split(cmd) action = cmdargv[0] if action == 'git-upload-pack' or action == 'git-receive-pack': + if len(cmdargv) < 2: + die_with_help("%s: missing path" % (action)) path = repo_base_path.rstrip('/') + cmdargv[1] if not repo_path_validate(path): - die('invalid path: %s' % (path)) + die('%s: invalid path: %s' % (action, path)) pkgbase = repo_path_get_pkgbase(path) if action == 'git-receive-pack': if not check_permissions(pkgbase, user): - die('permission denied: %s' % (user)) + die('%s: permission denied: %s' % (action, user)) os.environ["AUR_USER"] = user os.environ["AUR_GIT_DIR"] = path os.environ["AUR_PKGBASE"] = pkgbase @@ -103,7 +109,15 @@ if action == 'git-upload-pack' or action == 'git-receive-pack': os.execl(git_shell_cmd, git_shell_cmd, '-c', cmd) elif action == 'setup-repo': if len(cmdargv) < 2: - die('missing repository name') + die_with_help("%s: missing repository name" % (action)) + if len(cmdargv) > 2: + die_with_help("%s: too many arguments" % (action)) setup_repo(cmdargv[1], user) +elif action == 'help': + die("Commands:\n" + + " help Show this help message and exit.\n" + + " setup-repo <name> Create an empty repository.\n" + + " git-receive-pack Internal command used with Git.\n" + + " git-upload-pack Internal command used with Git.") else: - die('invalid command: %s' % (action)) + die_with_help("invalid command: %s" % (action)) -- 2.2.1

1 1

[aur-dev] [PATCH] INSTALL: Add some notes
by Lukas Fleischer 01 Jan '15

01 Jan '15

* Add more details on how to configure the web server. * Clarify that the OpenSSH patch is build against OpenSSH 6.7p1. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- INSTALL | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/INSTALL b/INSTALL index 72e7539..2368db1 100644 --- a/INSTALL +++ b/INSTALL @@ -6,7 +6,12 @@ Setup on Arch Linux $ cd /srv/http/ $ git clone git://projects.archlinux.org/aur.git -2) Setup a web server with PHP and MySQL. +2) Setup a web server with PHP and MySQL. Configure the web server to redirect + all URLs to /index.php/foo/bar/. The following block can be used with nginx: + + location ~ .* { + rewrite ^/(.*)$ /index.php/$1 last; + } 3) Copy conf/config.proto to conf/config and adjust the configuration. @@ -19,6 +24,7 @@ Setup on Arch Linux $ cd /srv/http/aur/ $ git clone git://anongit.mindrot.org/openssh.git $ cd openssh + $ git checkout V_6_7_P1 $ git am ../scripts/git-integration/0001-Patch-sshd-for-the-AUR.patch $ autoreconf $ ./configure -- 2.2.1

1 0

[aur-dev] Problem compiling OpenSSH
by Marcel Korpel 31 Dec '14

31 Dec '14

Perhaps I'm not that sharp, but I'm not able to compile OpenSSH succesfully. I followed all steps in INSTALL, but things fail for me after issuing `make` in step 5. My terminal reads: auth2-pubkey.c: In function ‘user_key_command_allowed2’: auth2-pubkey.c:579:34: error: ‘SSH_FP_MD5’ undeclared (first use in this function) keytext = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX); ^ auth2-pubkey.c:579:34: note: each undeclared identifier is reported only once for each function it appears in auth2-pubkey.c:523:18: warning: unused variable ‘errmsg’ [-Wunused-variable] char *username, errmsg[512]; ^ Makefile:148: recipe for target 'auth2-pubkey.o' failed make: *** [auth2-pubkey.o] Error 1 I suppose SSH_FP_MD5 is a constant, but I cannot find it elsewhere. Is there something I do wrong here? Regards, Marcel

4 7

[aur-dev] AUR 4.0.0 pre-alpha
by Lukas Fleischer 30 Dec '14

30 Dec '14

The 4.0.0 release brings Git repositories to AUR packages. You can test a pre-alpha version at aur-dev.archlinux.org [1]. In order to submit packages, you can follow these steps: 1. Create a new SSH key pair for the AUR. While this step is not strictly necessary (you can use any existing SSH key), it is recommended to do this: $ ssh-keygen -f ~/.ssh/id_rsa-aur 2. Log into the AUR web interface at [1], go to "My Account" and copy the content of ~/.ssh/id_rsa-aur.pub (or any other key you want to use) into the "SSH Public Key" field. Click "Update" to save the key. 3. The SSH daemon for the AUR uses a custom user and a custom port. It is recommended to add the following lines to your ~/.ssh/config so you don't need to specify user and port each time you connect to the AUR SSH interface: Host aur-dev.archlinux.org IdentityFile ~/.ssh/id_rsa-aur User aur Port 2222 4. To create a new (empty) package base foobar, run the following command: $ ssh aur-dev.archlinux.org setup-repo foobar 5. If you want to submit changes to a package base, you need to clone the package repository via SSH: $ git clone ssh+git://aur-dev.archlinux.org/foobar.git/ When making changes to the repository, make sure you always include the PKGBUILD and .SRCINFO in the top-level directory. You can submit new versions of a package base to the AUR by committing the new PKGBUILD and .SRCINFO and running `git push`. If you spot any major flaws or have suggestions for the new interface, please let me know. Regards, Lukas [1] https://aur-dev.archlinux.org/

4 6

[aur-dev] [PATCH] git-update.py: Cast epoch to an integer
by Lukas Fleischer 30 Dec '14

30 Dec '14

Convert epoch values before doing integer comparisons. Also, add a sanity check for the epoch variable. Reported-by: Ido Rosen <ido(a)kernel.org> Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- scripts/git-integration/git-update.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/git-integration/git-update.py b/scripts/git-integration/git-update.py index 94da12e..6888ad0 100755 --- a/scripts/git-integration/git-update.py +++ b/scripts/git-integration/git-update.py @@ -42,8 +42,8 @@ def save_srcinfo(srcinfo, db, cur, user): for pkgname in srcinfo.GetPackageNames(): pkginfo = srcinfo.GetMergedPackage(pkgname) - if 'epoch' in pkginfo and pkginfo['epoch'] > 0: - ver = '%d:%s-%s' % (pkginfo['epoch'], pkginfo['pkgver'], + if 'epoch' in pkginfo and int(pkginfo['epoch']) > 0: + ver = '%d:%s-%s' % (int(pkginfo['epoch']), pkginfo['pkgver'], pkginfo['pkgrel']) else: ver = '%s-%s' % (pkginfo['pkgver'], pkginfo['pkgrel']) @@ -189,6 +189,9 @@ for commit in walker: for pkgname in srcinfo.GetPackageNames(): pkginfo = srcinfo.GetMergedPackage(pkgname) + if 'epoch' in pkginfo and not pkginfo['epoch'].isdigit(): + die_commit('invalid epoch: %s' % (pkginfo['epoch']), commit.id) + if not re.match(r'[a-z0-9][a-z0-9\.+_-]*$', pkginfo['pkgname']): die_commit('invalid package name: %s' % (pkginfo['pkgname']), commit.id) -- 2.2.1

1 0

Re: [aur-dev] [aur-general] AUR 4.0.0 pre-alpha
by Lukas Fleischer 29 Dec '14

29 Dec '14

On Mon, 29 Dec 2014 at 22:16:45, Ido Rosen wrote: > Will all existing AUR packages automatically get their own git > repositories or will we have to resubmit all packages? > [...] Both. The current plan is as follows: A couple of weeks before the official release of 4.0.0, I will reset the setup on aur-dev.archlinux.org and create an empty Git repository for each package that exists in the AUR at that moment. The package maintainer will be retained so that nobody can take over anybody else's package. AUR package maintainers are then asked to upload their packages to aur-dev.archlinux.org and co-maintain them on aur.archlinux.org and the Git repository on aur-dev.archlinux.org for some time (roughly four weeks). Users who have already been using Git for their AUR packages can add .SRCINFO to all commits and import the whole history. At some point in time, I am going to remove all package bases that have not been uploaded to aur-dev.archlinux.org and move everything from aur-dev.archlinux.org to aur.archlinux.org. It is a huge AUR cleanup.

1 0

[aur-dev] Architecture specific fields and RPC interface
by Rémy Marquis 29 Dec '14

29 Dec '14

Hi Lukas, Thanks for the great work achieved with AUR 3.5.0/3.5.1. Pacman 4.2 and AUR support the new architecture specific fields (such as depends_x86_64, depends_i686). I however just realized that the RPC interface (v3) now lists all depends and makedepends in the same generic array. Are there any plan to support these fields through the RPC interface? Maybe with new (Make)Depends_i686/_x86_64 json arrays? Thanks, Remy

2 1

[aur-dev] [PATCH] Disallow specifying an SSH key during registration
by Lukas Fleischer 29 Dec '14

29 Dec '14

Make sure that users confirm their email addresses before setting an initial SSH key. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/template/account_edit_form.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/template/account_edit_form.php b/web/template/account_edit_form.php index 996c207..110fbb5 100644 --- a/web/template/account_edit_form.php +++ b/web/template/account_edit_form.php @@ -97,10 +97,12 @@ <input type="text" size="30" maxlength="50" name="K" id="id_pgp" value="<?= html_format_pgp_fingerprint($K) ?>" /> </p> + <?php if ($A == "UpdateAccount"): ?> <p> <label for="id_ssh"><?= __("SSH Public Key") ?>:</label> <textarea name="PK" id="id_ssh" rows="5" cols="30"><?= htmlspecialchars($PK) ?></textarea> </p> + <?php endif; ?> <p> <label for="id_language"><?= __("Language") ?>:</label> -- 2.2.1

1 0

[aur-dev] [PATCH] Add systemd unit files for the AUR sshd
by Lukas Fleischer 29 Dec '14

29 Dec '14

Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- INSTALL | 7 +++++-- conf/aur-sshd.socket | 6 ++++++ conf/aur-sshd@.service | 8 ++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 conf/aur-sshd.socket create mode 100644 conf/aur-sshd@.service diff --git a/INSTALL b/INSTALL index b198997..72e7539 100644 --- a/INSTALL +++ b/INSTALL @@ -37,6 +37,9 @@ Setup on Arch Linux # useradd -U -d /srv/http/aur -c 'AUR user' aur # chown aur:aur /srv/http/aur/.ssh/ -8) Run the sshd as the new user. +8) Add, enable and start systemd unit files for the new sshd: - $ /srv/http/aur/openssh/sshd -f /srv/http/aur/.ssh/sshd_config + # cp /srv/http/aur/conf/aur-sshd.socket /etc/systemd/system/ + # cp /srv/http/aur/conf/aur-sshd@.service /etc/systemd/system/ + # systemctl enable aur-sshd.socket + # systemctl start aur-sshd.socket diff --git a/conf/aur-sshd.socket b/conf/aur-sshd.socket new file mode 100644 index 0000000..5b0c3df --- /dev/null +++ b/conf/aur-sshd.socket @@ -0,0 +1,6 @@ +[Socket] +ListenStream=2222 +Accept=yes + +[Install] +WantedBy=sockets.target diff --git a/conf/aur-sshd@.service b/conf/aur-sshd@.service new file mode 100644 index 0000000..e29c292 --- /dev/null +++ b/conf/aur-sshd@.service @@ -0,0 +1,8 @@ +[Unit] +Description=AUR OpenSSH Per-Connection Daemon + +[Service] +ExecStart=-/srv/http/aur/openssh/sshd -i -f /srv/http/aur/.ssh/sshd_config +User=aur +StandardInput=socket +StandardError=syslog -- 2.2.1

1 0