- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] git-update.py: Reject blacklisted packages
by Lukas Fleischer 08 Jan '15

08 Jan '15

Reject commits adding packages which are in the official repositories already. Fixes FS#43371. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- scripts/git-integration/git-update.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/scripts/git-integration/git-update.py b/scripts/git-integration/git-update.py index b20c0a2..15a731c 100755 --- a/scripts/git-integration/git-update.py +++ b/scripts/git-integration/git-update.py @@ -176,6 +176,14 @@ walker = repo.walk(sha1_new, pygit2.GIT_SORT_TOPOLOGICAL) if sha1_old != "0000000000000000000000000000000000000000": walker.hide(sha1_old) +db = mysql.connector.connect(host=aur_db_host, user=aur_db_user, + passwd=aur_db_pass, db=aur_db_name, + unix_socket=aur_db_socket, buffered=True) +cur = db.cursor() + +cur.execute("SELECT Name FROM PackageBlacklist") +blacklist = [row[0] for row in cur.fetchall()] + for commit in walker: if not '.SRCINFO' in commit.tree: die_commit("missing .SRCINFO", commit.id) @@ -211,6 +219,10 @@ for commit in walker: die_commit('invalid package name: %s' % (pkginfo['pkgname']), commit.id) + if pkginfo['pkgname'] in blacklist: + die_commit('package is blacklisted: %s' % (pkginfo['pkgname']), + commit.id) + if not re.match(r'(?:http|ftp)s?://.*', pkginfo['url']): die_commit('invalid URL: %s' % (pkginfo['url']), commit.id) @@ -223,11 +235,8 @@ srcinfo_raw = repo[repo[sha1_new].tree['.SRCINFO'].id].data.decode() srcinfo_raw = srcinfo_raw.split('\n') srcinfo = aurinfo.ParseAurinfoFromIterable(srcinfo_raw) -db = mysql.connector.connect(host=aur_db_host, user=aur_db_user, - passwd=aur_db_pass, db=aur_db_name, - unix_socket=aur_db_socket, buffered=True) -cur = db.cursor() save_srcinfo(srcinfo, db, cur, user) + db.close() with open(git_dir + '/description', 'w') as f: -- 2.2.1

1 0

[aur-dev] [PATCH] Fix link to package base voters
by Lukas Fleischer 07 Jan '15

07 Jan '15

Reported-by: Bartłomiej Piotrowski <b(a)bpiotrowski.pl> Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/template/pkg_details.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index 359ea3c..52afba2 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -324,7 +324,7 @@ if (has_credential(CRED_PKGBASE_CHANGE_CATEGORY, array($row["MaintainerUID"]))): <tr> <th><?= __('Votes') . ': ' ?></th> <?php if (has_credential(CRED_PKGBASE_LIST_VOTERS)): ?> - <td><a href="<?= get_pkgbase_uri($row['Name']); ?>voters/"><?= $votes ?></a></td> + <td><a href="<?= get_pkgbase_uri($row['BaseName']); ?>voters/"><?= $votes ?></a></td> <?php else: ?> <td><?= $votes ?></td> <?php endif; ?> -- 2.2.1

1 0

[aur-dev] [PATCH] Add support for package base co-maintainers
by Lukas Fleischer 07 Jan '15

07 Jan '15

This allows for having multiple co-maintainers for AUR packages. Co-maintainers have push access to the package base Git repository but are not allowed to change the package base category, disown the package or modify the list of co-maintainers. The primary maintainer of an AUR package can edit the list of co-maintainers from the Package Actions box. Implements FS#17911. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- schema/aur-schema.sql | 11 ++++++ scripts/git-integration/git-serve.py | 11 +++--- scripts/git-integration/git-update.py | 8 +++-- upgrading/4.0.0.txt | 15 +++++++- web/html/index.php | 3 ++ web/html/pkgbase.php | 4 ++- web/lib/credentials.inc.php | 2 ++ web/lib/pkgbasefuncs.inc.php | 64 +++++++++++++++++++++++++++++++++++ web/template/comaintainers_form.php | 20 +++++++++++ web/template/pkg_details.php | 3 ++ web/template/pkgbase_details.php | 3 ++ 11 files changed, 135 insertions(+), 9 deletions(-) create mode 100644 web/template/comaintainers_form.php diff --git a/schema/aur-schema.sql b/schema/aur-schema.sql index dfd158f..9c647d8 100644 --- a/schema/aur-schema.sql +++ b/schema/aur-schema.sql @@ -276,6 +276,17 @@ CREATE TABLE PackageComments ( FOREIGN KEY (PackageBaseID) REFERENCES PackageBases(ID) ON DELETE CASCADE ) ENGINE = InnoDB; +-- Package base co-maintainers +-- +CREATE TABLE PackageComaintainers ( + UsersID INTEGER UNSIGNED NOT NULL, + PackageBaseID INTEGER UNSIGNED NOT NULL, + INDEX (UsersID), + INDEX (PackageBaseID), + FOREIGN KEY (UsersID) REFERENCES Users(ID) ON DELETE CASCADE, + FOREIGN KEY (PackageBaseID) REFERENCES PackageBases(ID) ON DELETE CASCADE +) ENGINE = InnoDB; + -- Comment addition notifications -- CREATE TABLE CommentNotify ( diff --git a/scripts/git-integration/git-serve.py b/scripts/git-integration/git-serve.py index a1c6e3a..d551dba 100755 --- a/scripts/git-integration/git-serve.py +++ b/scripts/git-integration/git-serve.py @@ -92,10 +92,13 @@ def check_permissions(pkgbase, user): unix_socket=aur_db_socket, buffered=True) cur = db.cursor() - cur.execute("SELECT COUNT(*) FROM PackageBases INNER JOIN Users " + - "ON Users.ID = PackageBases.MaintainerUID OR " + - "PackageBases.MaintainerUID IS NULL WHERE " + - "Name = %s AND Username = %s", [pkgbase, user]) + cur.execute("SELECT COUNT(*) FROM PackageBases " + + "LEFT JOIN PackageComaintainers " + + "ON PackageComaintainers.PackageBaseID = PackageBases.ID " + + "INNER JOIN Users ON Users.ID = PackageBases.MaintainerUID " + + "OR PackageBases.MaintainerUID IS NULL " + + "OR Users.ID = PackageComaintainers.UsersID " + + "WHERE Name = %s AND Username = %s", [pkgbase, user]) return cur.fetchone()[0] > 0 def die(msg): diff --git a/scripts/git-integration/git-update.py b/scripts/git-integration/git-update.py index 1ff09b8..b20c0a2 100755 --- a/scripts/git-integration/git-update.py +++ b/scripts/git-integration/git-update.py @@ -47,9 +47,11 @@ def save_srcinfo(srcinfo, db, cur, user): # Update package base details and delete current packages. cur.execute("UPDATE PackageBases SET ModifiedTS = UNIX_TIMESTAMP(), " + - "MaintainerUID = %s, PackagerUID = %s, " + - "OutOfDateTS = NULL WHERE ID = %s", - [user_id, user_id, pkgbase_id]) + "PackagerUID = %s, OutOfDateTS = NULL WHERE ID = %s", + [user_id, pkgbase_id]) + cur.execute("UPDATE PackageBases SET MaintainerUID = %s " + + "WHERE ID = %s AND MaintainerUID IS NULL", + [user_id, pkgbase_id]) cur.execute("DELETE FROM Packages WHERE PackageBaseID = %s", [pkgbase_id]) diff --git a/upgrading/4.0.0.txt b/upgrading/4.0.0.txt index f990c37..b1582f2 100644 --- a/upgrading/4.0.0.txt +++ b/upgrading/4.0.0.txt @@ -16,4 +16,17 @@ init-repos.py to initialize them. UPDATE PackageBases SET PackagerUID = NULL; ---- -5. (optional) Setup cgit to browse the Git repositories via HTTP. +5. Create a new table for package base co-maintainers: + +---- +CREATE TABLE PackageComaintainers ( + UsersID INTEGER UNSIGNED NOT NULL, + PackageBaseID INTEGER UNSIGNED NOT NULL, + INDEX (UsersID), + INDEX (PackageBaseID), + FOREIGN KEY (UsersID) REFERENCES Users(ID) ON DELETE CASCADE, + FOREIGN KEY (PackageBaseID) REFERENCES PackageBases(ID) ON DELETE CASCADE +) ENGINE = InnoDB; +---- + +6. (optional) Setup cgit to browse the Git repositories via HTTP. diff --git a/web/html/index.php b/web/html/index.php index 9c321fa..cfd6598 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -78,6 +78,9 @@ if (!empty($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { case "request": include('pkgreq.php'); return; + case "comaintainers": + include('comaintainers.php'); + return; default: header("HTTP/1.0 404 Not Found"); include "./404.php"; diff --git a/web/html/pkgbase.php b/web/html/pkgbase.php index bdce516..201749e 100644 --- a/web/html/pkgbase.php +++ b/web/html/pkgbase.php @@ -97,6 +97,8 @@ if (check_token()) { list($ret, $output) = pkgreq_file($ids, $_POST['type'], $_POST['merge_into'], $_POST['comments']); } elseif (current_action("do_CloseRequest")) { list($ret, $output) = pkgreq_close($_POST['reqid'], $_POST['reason'], $_POST['comments']); + } elseif (current_action("do_EditComaintainers")) { + list($ret, $output) = pkgbase_set_comaintainers($base_id, explode("\n", $_POST['users'])); } if (isset($_REQUEST['comment'])) { @@ -124,7 +126,7 @@ if (check_token()) { } $pkgs = pkgbase_get_pkgnames($base_id); -if (count($pkgs) == 1) { +if (!$output && count($pkgs) == 1) { /* Not a split package. Redirect to the package page. */ if (empty($_SERVER['QUERY_STRING'])) { header('Location: ' . get_pkg_uri($pkgs[0])); diff --git a/web/lib/credentials.inc.php b/web/lib/credentials.inc.php index 6c70ede..b813b90 100644 --- a/web/lib/credentials.inc.php +++ b/web/lib/credentials.inc.php @@ -11,6 +11,7 @@ define("CRED_PKGBASE_ADOPT", 7); define("CRED_PKGBASE_CHANGE_CATEGORY", 8); define("CRED_PKGBASE_DELETE", 9); define("CRED_PKGBASE_DISOWN", 10); +define("CRED_PKGBASE_EDIT_COMAINTAINERS", 24); define("CRED_PKGBASE_FLAG", 11); define("CRED_PKGBASE_LIST_VOTERS", 12); define("CRED_PKGBASE_NOTIFY", 13); @@ -61,6 +62,7 @@ function has_credential($credential, $approved_users=array()) { case CRED_PKGBASE_ADOPT: case CRED_PKGBASE_CHANGE_CATEGORY: case CRED_PKGBASE_DELETE: + case CRED_PKGBASE_EDIT_COMAINTAINERS: case CRED_PKGBASE_DISOWN: case CRED_PKGBASE_LIST_VOTERS: case CRED_PKGBASE_SUBMIT_BLACKLISTED: diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index 655856b..5741b01 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -928,3 +928,67 @@ function pkgbase_update_category($base_id, $category_id) { $category_id, $base_id); $dbh->exec($q); } + +/** + * Get a list of package base co-maintainers + * + * @param int $base_id The package base ID to retrieve the co-maintainers for + * + * @return array An array of co-maintainer user names + */ +function pkgbase_get_comaintainers($base_id) { + $dbh = DB::connect(); + $q = "SELECT UserName FROM PackageComaintainers "; + $q .= "INNER JOIN Users ON Users.ID = PackageComaintainers.UsersID "; + $q .= "WHERE PackageComaintainers.PackageBaseID = " . intval($base_id); + $result = $dbh->query($q); + + if ($result) { + return $result->fetchAll(PDO::FETCH_COLUMN, 0); + } else { + return array(); + } +} + +/** + * Update the list of co-maintainers of a package base + * + * @param int $base_id The package base ID to update the co-maintainers of + * @param array $users Array of co-maintainer user names + * + * @return array Tuple of success/failure indicator and error message + */ +function pkgbase_set_comaintainers($base_id, $users) { + if (!has_credential(CRED_PKGBASE_EDIT_COMAINTAINERS, array(pkgbase_maintainer_uid($base_id)))) { + return array(false, __("You are not allowed to manage co-maintainers of this package base.")); + } + + /* Remove empty and duplicate user names. */ + $users = array_unique(array_filter(array_map('trim', $users))); + + $dbh = DB::connect(); + + $uids = array(); + foreach($users as $user) { + $q = "SELECT ID FROM Users "; + $q .= "WHERE UserName = " . $dbh->quote($user); + $result = $dbh->query($q); + $uid = $result->fetchColumn(0); + + if (!$uid) { + return array(false, __("Invalid user name: %s", $user)); + } + + $uids[] = $uid; + } + + $q = sprintf("DELETE FROM PackageComaintainers WHERE PackageBaseID = %d", $base_id); + $dbh->exec($q); + + foreach ($uids as $uid) { + $q = sprintf("INSERT INTO PackageComaintainers (PackageBaseID, UsersID) VALUES (%d, %d)", $base_id, $uid); + $dbh->exec($q); + } + + return array(true, __("The package base co-maintainers have been updated.")); +} diff --git a/web/template/comaintainers_form.php b/web/template/comaintainers_form.php new file mode 100644 index 0000000..050f255 --- /dev/null +++ b/web/template/comaintainers_form.php @@ -0,0 +1,20 @@ +<div class="box"> + <h2><?= __('Manage Co-maintainers: %s', htmlspecialchars($pkgbase_name)) ?></h2> + <p> + <?= __('Use this form to add co-maintainers for %s%s%s (one user name per line):', + '<strong>', htmlspecialchars($pkgbase_name), '</strong>'); ?> + </p> + <form action="<?= get_pkgbase_uri($pkgbase_name); ?>" method="post"> + <fieldset> + <input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" /> + <p> + <label for="id_users"><?= __("Users") ?>:</label> + <textarea name="users" id="id_users" rows="5" cols="50"><?= htmlspecialchars(implode("\n", $users)) ?></textarea> + </p> + <p> + <input type="submit" class="button" name="do_EditComaintainers" value="<?= __("Save") ?>" /> + </p> + </fieldset> + </form> +</div> + diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index ecb081c..359ea3c 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -131,6 +131,9 @@ $sources = pkg_sources($row["ID"]); </form> </li> <?php endif; ?> + <?php if (has_credential(CRED_PKGBASE_EDIT_COMAINTAINERS, array($row["MaintainerUID"]))): ?> + <li><a href="<?= get_pkgbase_uri($row['BaseName']) . 'comaintainers/'; ?>"><?= __('Manage Co-Maintainers'); ?></a></li> + <?php endif; ?> <li><span class="flagged"><?php if ($row["RequestCount"] > 0) { echo _n('%d pending request', '%d pending requests', $row["RequestCount"]); } ?></span></li> <li><a href="<?= get_pkgbase_uri($row['BaseName']) . 'request/'; ?>"><?= __('File Request'); ?></a></li> <?php if (has_credential(CRED_PKGBASE_DELETE)): ?> diff --git a/web/template/pkgbase_details.php b/web/template/pkgbase_details.php index e698fb0..ae363fd 100644 --- a/web/template/pkgbase_details.php +++ b/web/template/pkgbase_details.php @@ -82,6 +82,9 @@ $pkgs = pkgbase_get_pkgnames($base_id); </form> </li> <?php endif; ?> + <?php if (has_credential(CRED_PKGBASE_EDIT_COMAINTAINERS, array($row["MaintainerUID"]))): ?> + <li><a href="<?= get_pkgbase_uri($row['Name']) . 'comaintainers/'; ?>"><?= __('Manage Co-Maintainers'); ?></a></li> + <?php endif; ?> <li><span class="flagged"><?php if ($row["RequestCount"] > 0) { echo _n('%d pending request', '%d pending requests', $row["RequestCount"]); } ?></span></li> <li><a href="<?= get_pkgbase_uri($row['Name']) . 'request/'; ?>"><?= __('File Request'); ?></a></li> <?php if (has_credential(CRED_PKGBASE_DELETE)): ?> -- 2.2.1

1 3

[aur-dev] [PATCH] git-serve.py: Allow TUs to push to any repository
by Lukas Fleischer 07 Jan '15

07 Jan '15

Implements FS#32807. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- scripts/git-integration/git-serve.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/git-integration/git-serve.py b/scripts/git-integration/git-serve.py index d551dba..227e37b 100755 --- a/scripts/git-integration/git-serve.py +++ b/scripts/git-integration/git-serve.py @@ -92,6 +92,10 @@ def check_permissions(pkgbase, user): unix_socket=aur_db_socket, buffered=True) cur = db.cursor() + cur.execute("SELECT AccountTypeID FROM Users WHERE UserName = %s ", [user]) + if cur.fetchone()[0] > 1: + return True + cur.execute("SELECT COUNT(*) FROM PackageBases " + "LEFT JOIN PackageComaintainers " + "ON PackageComaintainers.PackageBaseID = PackageBases.ID " + -- 2.2.1

1 0

[aur-dev] [PATCH] git-update.py: Support architecture-specific fields
by Lukas Fleischer 07 Jan '15

07 Jan '15

Fixes FS#43356. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- scripts/git-integration/git-update.py | 51 ++++++++++++++++++++++------------- 1 file changed, 32 insertions(+), 19 deletions(-) diff --git a/scripts/git-integration/git-update.py b/scripts/git-integration/git-update.py index 6888ad0..1ff09b8 100755 --- a/scripts/git-integration/git-update.py +++ b/scripts/git-integration/git-update.py @@ -19,6 +19,20 @@ aur_db_user = config.get('database', 'user') aur_db_pass = config.get('database', 'password') aur_db_socket = config.get('database', 'socket') +def extract_arch_fields(pkginfo, field): + values = [] + + if field in pkginfo: + for val in pkginfo[field]: + values.append({"value": val, "arch": None}) + + for arch in ['i686', 'x86_64']: + if field + '_' + arch in pkginfo: + for val in pkginfo[field + '_' + arch]: + values.append({"value": val, "arch": arch}) + + return values + def save_srcinfo(srcinfo, db, cur, user): # Obtain package base ID and previous maintainer. pkgbase = srcinfo._pkgbase['pkgname'] @@ -58,40 +72,39 @@ def save_srcinfo(srcinfo, db, cur, user): pkgid = cur.lastrowid # Add package sources. - for source in pkginfo['source']: - cur.execute("INSERT INTO PackageSources (PackageID, Source) " + - "VALUES (%s, %s)", [pkgid, source]) + for source_info in extract_arch_fields(pkginfo, 'source'): + cur.execute("INSERT INTO PackageSources (PackageID, Source, " + + "SourceArch) VALUES (%s, %s, %s)", + [pkgid, source_info['value'], source_info['arch']]) # Add package dependencies. for deptype in ('depends', 'makedepends', 'checkdepends', 'optdepends'): - if not deptype in pkginfo: - continue cur.execute("SELECT ID FROM DependencyTypes WHERE Name = %s", [deptype]) deptypeid = cur.fetchone()[0] - for dep in pkginfo[deptype]: - depname = re.sub(r'(<|=|>).*', '', dep) - depcond = dep[len(depname):] + for dep_info in extract_arch_fields(pkginfo, deptype): + depname = re.sub(r'(<|=|>).*', '', dep_info['value']) + depcond = dep_info['value'][len(depname):] + deparch = dep_info['arch'] cur.execute("INSERT INTO PackageDepends (PackageID, " + - "DepTypeID, DepName, DepCondition) " + - "VALUES (%s, %s, %s, %s)", [pkgid, deptypeid, - depname, depcond]) + "DepTypeID, DepName, DepCondition, DepArch) " + + "VALUES (%s, %s, %s, %s, %s)", + [pkgid, deptypeid, depname, depcond, deparch]) # Add package relations (conflicts, provides, replaces). for reltype in ('conflicts', 'provides', 'replaces'): - if not reltype in pkginfo: - continue cur.execute("SELECT ID FROM RelationTypes WHERE Name = %s", [reltype]) reltypeid = cur.fetchone()[0] - for rel in pkginfo[reltype]: - relname = re.sub(r'(<|=|>).*', '', rel) - relcond = rel[len(relname):] + for rel_info in extract_arch_fields(pkginfo, reltype): + relname = re.sub(r'(<|=|>).*', '', rel_info['value']) + relcond = rel_info['value'][len(relname):] + relarch = rel_info['arch'] cur.execute("INSERT INTO PackageRelations (PackageID, " + - "RelTypeID, RelName, RelCondition) " + - "VALUES (%s, %s, %s, %s)", [pkgid, reltypeid, - relname, relcond]) + "RelTypeID, RelName, RelCondition, RelArch) " + + "VALUES (%s, %s, %s, %s, %s)", + [pkgid, reltypeid, relname, relcond, relarch]) # Add package licenses. if 'license' in pkginfo: -- 2.2.1

1 0

[aur-dev] [PATCH 1/2] git-serve.py: Automatically create repositories
by Lukas Fleischer 06 Jan '15

06 Jan '15

Create a fresh Git repository when cloning or pushing using a path that does not yet exist. Implements FS#43308. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- scripts/git-integration/git-serve.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/git-integration/git-serve.py b/scripts/git-integration/git-serve.py index c81887b..800eada 100755 --- a/scripts/git-integration/git-serve.py +++ b/scripts/git-integration/git-serve.py @@ -119,6 +119,8 @@ if action == 'git-upload-pack' or action == 'git-receive-pack': if not repo_path_validate(path): die('%s: invalid path: %s' % (action, path)) pkgbase = repo_path_get_pkgbase(path) + if not os.path.exists(path): + setup_repo(pkgbase, user) if action == 'git-receive-pack': if not check_permissions(pkgbase, user): die('%s: permission denied: %s' % (action, user)) -- 2.2.1

1 1

[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