- Aur-dev - lists.archlinux.org

[PATCH 1/3] rendercomment: safer Flyspray task linkification
by Frédéric Mangano-Tarumi 02 Feb '20

02 Feb '20

When an FS#123 is part of a code block, it must not be converted into a link. FS#123 may also appear inside an URL, in which case regular linkifaction of URLs must take precedence. --- aurweb/scripts/rendercomment.py | 21 ++++++++++++++------- test/t2600-rendercomment.sh | 26 ++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 7 deletions(-) diff --git a/aurweb/scripts/rendercomment.py b/aurweb/scripts/rendercomment.py index ba28486..7cba6ef 100755 --- a/aurweb/scripts/rendercomment.py +++ b/aurweb/scripts/rendercomment.py @@ -29,18 +29,25 @@ class LinkifyExtension(markdown.extensions.Extension): md.inlinePatterns.add('linkify', processor, '_end') -class FlysprayLinksPreprocessor(markdown.preprocessors.Preprocessor): - _fsre = re.compile(r'\b(FS#(\d+))\b') - _sub = r'[\1](https://bugs.archlinux.org/task/\2)' +class FlysprayLinksInlineProcessor(markdown.inlinepatterns.InlineProcessor): + """ + Turn Flyspray task references like FS#1234 into links to bugs.archlinux.org. + + The pattern's capture group 0 is the text of the link and group 1 is the + Flyspray task ID. + """ - def run(self, lines): - return [self._fsre.sub(self._sub, line) for line in lines] + def handleMatch(self, m, data): + el = markdown.util.etree.Element('a') + el.set('href', f'https://bugs.archlinux.org/task/{m.group(1)}') + el.text = markdown.util.AtomicString(m.group(0)) + return el, m.start(0), m.end(0) class FlysprayLinksExtension(markdown.extensions.Extension): def extendMarkdown(self, md, md_globals): - preprocessor = FlysprayLinksPreprocessor(md) - md.preprocessors.add('flyspray-links', preprocessor, '_end') + processor = FlysprayLinksInlineProcessor(r'\bFS#(\d+)\b',md) + md.inlinePatterns.add('flyspray-links', processor, '_end') class GitCommitsInlineProcessor(markdown.inlinepatterns.InlineProcessor): diff --git a/test/t2600-rendercomment.sh b/test/t2600-rendercomment.sh index b0209eb..1da422d 100755 --- a/test/t2600-rendercomment.sh +++ b/test/t2600-rendercomment.sh @@ -103,4 +103,30 @@ test_expect_success 'Test Git commit linkification.' ' test_cmp actual expected ' +test_expect_success 'Test Flyspray issue linkification.' ' + sqlite3 aur.db <<-EOD && + INSERT INTO PackageComments (ID, PackageBaseID, Comments, RenderedComment) VALUES (6, 1, " + FS#1234567. + *FS#1234* + FS# + XFS#1 + \`FS#1234\` + https://archlinux.org/?test=FS#1234 + ", ""); + EOD + "$RENDERCOMMENT" 6 && + cat <<-EOD >expected && + <p><a href="https://bugs.archlinux.org/task/1234567">FS#1234567</a>. + <em><a href="https://bugs.archlinux.org/task/1234">FS#1234</a></em> + FS# + XFS#1 + <code>FS#1234</code> + <a href="https://archlinux.org/?test=FS#1234">https://archlinux.org/?test=FS#1234</a></p> + EOD + sqlite3 aur.db <<-EOD >actual && + SELECT RenderedComment FROM PackageComments WHERE ID = 6; + EOD + test_cmp actual expected +' + test_done -- 2.25.0

2 1

[PATCH 3/3] rendercomment: use python-markdown's new registration API
by Frédéric Mangano-Tarumi 02 Feb '20

02 Feb '20

First, this gets rid of the deprecation warnings Python displayed. Second, this fixes the case where a link contained a pair of underscores, which used to be interpreted as an emphasis because the linkify processor ran after the emphasis processor. --- aurweb/scripts/rendercomment.py | 10 ++++++---- test/t2600-rendercomment.sh | 6 ++++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/aurweb/scripts/rendercomment.py b/aurweb/scripts/rendercomment.py index 7cba6ef..ed66756 100755 --- a/aurweb/scripts/rendercomment.py +++ b/aurweb/scripts/rendercomment.py @@ -26,7 +26,8 @@ class LinkifyExtension(markdown.extensions.Extension): def extendMarkdown(self, md, md_globals): processor = markdown.inlinepatterns.AutolinkInlineProcessor(self._urlre, md) - md.inlinePatterns.add('linkify', processor, '_end') + # Register it right after the default <>-link processor (priority 120). + md.inlinePatterns.register(processor, 'linkify', 119) class FlysprayLinksInlineProcessor(markdown.inlinepatterns.InlineProcessor): @@ -47,7 +48,7 @@ class FlysprayLinksInlineProcessor(markdown.inlinepatterns.InlineProcessor): class FlysprayLinksExtension(markdown.extensions.Extension): def extendMarkdown(self, md, md_globals): processor = FlysprayLinksInlineProcessor(r'\bFS#(\d+)\b',md) - md.inlinePatterns.add('flyspray-links', processor, '_end') + md.inlinePatterns.register(processor, 'flyspray-links', 118) class GitCommitsInlineProcessor(markdown.inlinepatterns.InlineProcessor): @@ -92,7 +93,7 @@ class GitCommitsExtension(markdown.extensions.Extension): def extendMarkdown(self, md, md_globals): processor = GitCommitsInlineProcessor(md, self._head) - md.inlinePatterns.add('git-commits', processor, '_end') + md.inlinePatterns.register(processor, 'git-commits', 117) class HeadingTreeprocessor(markdown.treeprocessors.Treeprocessor): @@ -106,7 +107,8 @@ class HeadingTreeprocessor(markdown.treeprocessors.Treeprocessor): class HeadingExtension(markdown.extensions.Extension): def extendMarkdown(self, md, md_globals): - md.treeprocessors.add('heading', HeadingTreeprocessor(md), '_end') + # Priority doesn't matter since we don't conflict with other processors. + md.treeprocessors.register(HeadingTreeprocessor(md), 'heading', 30) def get_comment(conn, commentid): diff --git a/test/t2600-rendercomment.sh b/test/t2600-rendercomment.sh index 1ba560a..be408b8 100755 --- a/test/t2600-rendercomment.sh +++ b/test/t2600-rendercomment.sh @@ -52,7 +52,8 @@ test_expect_success 'Test HTML sanitizing.' ' test_expect_success 'Test link conversion.' ' cat <<-EOD | sqlite3 aur.db && INSERT INTO PackageComments (ID, PackageBaseID, Comments, RenderedComment) VALUES (4, 1, " - Visit https://www.archlinux.org/. + Visit https://www.archlinux.org/#_test_. + Visit *https://www.archlinux.org/*. Visit <https://www.archlinux.org/>. Visit \`https://www.archlinux.org/\`. Visit [Arch Linux](https://www.archlinux.org/). @@ -62,7 +63,8 @@ test_expect_success 'Test link conversion.' ' EOD "$RENDERCOMMENT" 4 && cat <<-EOD >expected && - <p>Visit <a href="https://www.archlinux.org/">https://www.archlinux.org/</a>. + <p>Visit <a href="https://www.archlinux.org/#_test_">https://www.archlinux.org/#_test_</a>. + Visit <em><a href="https://www.archlinux.org/">https://www.archlinux.org/</a></em>. Visit <a href="https://www.archlinux.org/">https://www.archlinux.org/</a>. Visit <code>https://www.archlinux.org/</code>. Visit <a href="https://www.archlinux.org/">Arch Linux</a>. -- 2.25.0

1 0

[PATCH 2/3] rendercomment: test headings lowering
by Frédéric Mangano-Tarumi 02 Feb '20

02 Feb '20

--- test/t2600-rendercomment.sh | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/test/t2600-rendercomment.sh b/test/t2600-rendercomment.sh index 1da422d..1ba560a 100755 --- a/test/t2600-rendercomment.sh +++ b/test/t2600-rendercomment.sh @@ -129,4 +129,30 @@ test_expect_success 'Test Flyspray issue linkification.' ' test_cmp actual expected ' +test_expect_success 'Test headings lowering.' ' + sqlite3 aur.db <<-EOD && + INSERT INTO PackageComments (ID, PackageBaseID, Comments, RenderedComment) VALUES (7, 1, " + # One + ## Two + ### Three + #### Four + ##### Five + ###### Six + ", ""); + EOD + "$RENDERCOMMENT" 7 && + cat <<-EOD >expected && + <h5>One</h5> + <h6>Two</h6> + <h6>Three</h6> + <h6>Four</h6> + <h6>Five</h6> + <h6>Six</h6> + EOD + sqlite3 aur.db <<-EOD >actual && + SELECT RenderedComment FROM PackageComments WHERE ID = 7; + EOD + test_cmp actual expected +' + test_done -- 2.25.0

1 0

[PATCH] rendercomment: safer auto-linkification of URLs
by Frédéric Mangano-Tarumi 02 Feb '20

02 Feb '20

Fixes a few edge cases: - URLs within code blocks used to get redundant <> added, breaking bash code snippets like `curl https://...` into `curl <https://...>`. - Links written with markdown’s <https://...> syntax also used to get an extra pair of brackets. --- aurweb/scripts/rendercomment.py | 19 +++++++++++-------- test/t2600-rendercomment.sh | 15 +++++++++++++-- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/aurweb/scripts/rendercomment.py b/aurweb/scripts/rendercomment.py index ad39ceb..ba28486 100755 --- a/aurweb/scripts/rendercomment.py +++ b/aurweb/scripts/rendercomment.py @@ -13,17 +13,20 @@ repo_path = aurweb.config.get('serve', 'repo-path') commit_uri = aurweb.config.get('options', 'commit_uri') -class LinkifyPreprocessor(markdown.preprocessors.Preprocessor): - _urlre = re.compile(r'(\b(?:https?|ftp):\/\/[\w\/\#~:.?+=&%@!\-;,]+?' - r'(?=[.:?\-;,]*(?:[^\w\/\#~:.?+=&%@!\-;,]|$)))') - - def run(self, lines): - return [self._urlre.sub(r'<\1>', line) for line in lines] +class LinkifyExtension(markdown.extensions.Extension): + """ + Turn URLs into links, even without explicit markdown. + Do not linkify URLs in code blocks. + """ + # Captures http(s) and ftp URLs until the first non URL-ish character. + # Excludes trailing punctuation. + _urlre = (r'(\b(?:https?|ftp):\/\/[\w\/\#~:.?+=&%@!\-;,]+?' + r'(?=[.:?\-;,]*(?:[^\w\/\#~:.?+=&%@!\-;,]|$)))') -class LinkifyExtension(markdown.extensions.Extension): def extendMarkdown(self, md, md_globals): - md.preprocessors.add('linkify', LinkifyPreprocessor(md), '_end') + processor = markdown.inlinepatterns.AutolinkInlineProcessor(self._urlre, md) + md.inlinePatterns.add('linkify', processor, '_end') class FlysprayLinksPreprocessor(markdown.preprocessors.Preprocessor): diff --git a/test/t2600-rendercomment.sh b/test/t2600-rendercomment.sh index 7b3a4a8..b0209eb 100755 --- a/test/t2600-rendercomment.sh +++ b/test/t2600-rendercomment.sh @@ -51,11 +51,22 @@ test_expect_success 'Test HTML sanitizing.' ' test_expect_success 'Test link conversion.' ' cat <<-EOD | sqlite3 aur.db && - INSERT INTO PackageComments (ID, PackageBaseID, Comments, RenderedComment) VALUES (4, 1, "Visit https://www.archlinux.org/.", ""); + INSERT INTO PackageComments (ID, PackageBaseID, Comments, RenderedComment) VALUES (4, 1, " + Visit https://www.archlinux.org/. + Visit <https://www.archlinux.org/>. + Visit \`https://www.archlinux.org/\`. + Visit [Arch Linux](https://www.archlinux.org/). + Visit [Arch Linux][arch]. + [arch]: https://www.archlinux.org/ + ", ""); EOD "$RENDERCOMMENT" 4 && cat <<-EOD >expected && - <p>Visit <a href="https://www.archlinux.org/">https://www.archlinux.org/</a>.</p> + <p>Visit <a href="https://www.archlinux.org/">https://www.archlinux.org/</a>. + Visit <a href="https://www.archlinux.org/">https://www.archlinux.org/</a>. + Visit <code>https://www.archlinux.org/</code>. + Visit <a href="https://www.archlinux.org/">Arch Linux</a>. + Visit <a href="https://www.archlinux.org/">Arch Linux</a>.</p> EOD cat <<-EOD | sqlite3 aur.db >actual && SELECT RenderedComment FROM PackageComments WHERE ID = 4; -- 2.25.0

2 1

[PATCH] Update message catalog
by Lukas Fleischer 31 Jan '20

31 Jan '20

Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- po/aurweb.pot | 125 ++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 102 insertions(+), 23 deletions(-) diff --git a/po/aurweb.pot b/po/aurweb.pot index e49dc13..9240d2d 100644 --- a/po/aurweb.pot +++ b/po/aurweb.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the AUR package. +# This file is distributed under the same license as the AURWEB package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: AUR v4.6.0\n" +"Project-Id-Version: AURWEB v4.8.0\n" "Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" -"POT-Creation-Date: 2018-05-17 22:58+0200\n" +"POT-Creation-Date: 2020-01-31 08:43+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -73,6 +73,10 @@ msgstr "" msgid "You do not have permission to edit this account." msgstr "" +#: html/account.php lib/acctfuncs.inc.php +msgid "Invalid password." +msgstr "" + #: html/account.php msgid "Use this form to search existing accounts." msgstr "" @@ -367,10 +371,10 @@ msgid "Enter login credentials" msgstr "" #: html/login.php -msgid "User name or email address" +msgid "User name or primary email address" msgstr "" -#: html/login.php template/account_edit_form.php +#: html/login.php template/account_delete.php template/account_edit_form.php msgid "Password" msgstr "" @@ -431,7 +435,7 @@ msgid "Your password has been reset successfully." msgstr "" #: html/passreset.php -msgid "Confirm your e-mail address:" +msgid "Confirm your user name or primary e-mail address:" msgstr "" #: html/passreset.php @@ -449,12 +453,12 @@ msgstr "" #: html/passreset.php #, php-format msgid "" -"If you have forgotten the e-mail address you used to register, please send a " -"message to the %saur-general%s mailing list." +"If you have forgotten the user name and the primary e-mail address you used " +"to register, please send a message to the %saur-general%s mailing list." msgstr "" #: html/passreset.php -msgid "Enter your e-mail address:" +msgid "Enter your user name or your primary e-mail address:" msgstr "" #: html/pkgbase.php @@ -646,19 +650,19 @@ msgstr "" msgid "Close Request" msgstr "" -#: html/pkgreq.php lib/pkgfuncs.inc.php +#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php msgid "First" msgstr "" -#: html/pkgreq.php lib/pkgfuncs.inc.php +#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php msgid "Previous" msgstr "" -#: html/pkgreq.php lib/pkgfuncs.inc.php template/tu_list.php +#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php template/tu_list.php msgid "Next" msgstr "" -#: html/pkgreq.php lib/pkgfuncs.inc.php +#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php msgid "Last" msgstr "" @@ -759,10 +763,18 @@ msgstr "" msgid "Can contain only one period, underscore or hyphen." msgstr "" +#: lib/acctfuncs.inc.php +msgid "Please confirm your new password." +msgstr "" + #: lib/acctfuncs.inc.php msgid "The email address is invalid." msgstr "" +#: lib/acctfuncs.inc.php +msgid "The backup email address is invalid." +msgstr "" + #: lib/acctfuncs.inc.php msgid "The home page is invalid, please specify the full HTTP(s) URL." msgstr "" @@ -802,6 +814,18 @@ msgstr "" msgid "The SSH public key, %s%s%s, is already in use." msgstr "" +#: lib/acctfuncs.inc.php +msgid "The CAPTCHA is missing." +msgstr "" + +#: lib/acctfuncs.inc.php +msgid "This CAPTCHA has expired. Please try again." +msgstr "" + +#: lib/acctfuncs.inc.php +msgid "The entered CAPTCHA answer is invalid." +msgstr "" + #: lib/acctfuncs.inc.php #, php-format msgid "Error trying to create account, %s%s%s." @@ -1210,6 +1234,10 @@ msgstr "" msgid "Edit this user's account" msgstr "" +#: template/account_details.php +msgid "List this user's comments" +msgstr "" + #: template/account_edit_form.php #, php-format msgid "Click %shere%s if you want to permanently delete this account." @@ -1220,6 +1248,11 @@ msgstr "" msgid "Click %shere%s for user details." msgstr "" +#: template/account_edit_form.php +#, php-format +msgid "Click %shere%s to list the comments made by this account." +msgstr "" + #: template/account_edit_form.php msgid "required" msgstr "" @@ -1253,11 +1286,23 @@ msgid "" msgstr "" #: template/account_edit_form.php -msgid "Hide Email Address" +msgid "Backup Email Address" msgstr "" #: template/account_edit_form.php -msgid "Re-type password" +msgid "" +"Optionally provide a secondary email address that can be used to restore " +"your account in case you lose access to your primary email address." +msgstr "" + +#: template/account_edit_form.php +msgid "" +"Password reset links are always sent to both your primary and your backup " +"email address." +msgstr "" + +#: template/account_edit_form.php +msgid "Hide Email Address" msgstr "" #: template/account_edit_form.php @@ -1268,6 +1313,16 @@ msgstr "" msgid "Timezone" msgstr "" +#: template/account_edit_form.php +msgid "" +"If you want to change the password, enter a new password and confirm the new " +"password by entering it again." +msgstr "" + +#: template/account_edit_form.php +msgid "Re-type password" +msgstr "" + #: template/account_edit_form.php msgid "" "The following information is only required if you want to submit packages to " @@ -1294,6 +1349,24 @@ msgstr "" msgid "Notify of ownership changes" msgstr "" +#: template/account_edit_form.php +msgid "To confirm the profile changes, please enter your current password:" +msgstr "" + +#: template/account_edit_form.php +msgid "Your current password" +msgstr "" + +#: template/account_edit_form.php +msgid "" +"To protect the AUR against automated account creation, we kindly ask you to " +"provide the output of the following command:" +msgstr "" + +#: template/account_edit_form.php +msgid "Answer" +msgstr "" + #: template/account_edit_form.php template/pkgbase_details.php #: template/pkg_details.php msgid "Update" @@ -1422,7 +1495,7 @@ msgstr "" msgid "Disable notifications" msgstr "" -#: template/pkgbase_actions.php +#: template/pkgbase_actions.php template/pkg_comment_form.php msgid "Enable notifications" msgstr "" @@ -1453,6 +1526,10 @@ msgstr "" msgid "read-only" msgstr "" +#: template/pkgbase_details.php template/pkg_details.php +msgid "click to copy" +msgstr "" + #: template/pkgbase_details.php template/pkg_details.php #: template/pkg_search_form.php msgid "Keywords" @@ -1500,15 +1577,15 @@ msgid "Add Comment" msgstr "" #: template/pkg_comments.php -msgid "View all comments" +msgid "Pinned Comments" msgstr "" #: template/pkg_comments.php -msgid "Pinned Comments" +msgid "Latest Comments" msgstr "" #: template/pkg_comments.php -msgid "Latest Comments" +msgid "Comments for" msgstr "" #: template/pkg_comments.php @@ -1521,6 +1598,11 @@ msgstr "" msgid "Anonymous comment on %s" msgstr "" +#: template/pkg_comments.php +#, php-format +msgid "Commented on package %s on %s" +msgstr "" + #: template/pkg_comments.php #, php-format msgid "deleted on %s by %s" @@ -1557,10 +1639,6 @@ msgstr "" msgid "Unpin comment" msgstr "" -#: template/pkg_comments.php -msgid "All comments" -msgstr "" - #: template/pkg_details.php msgid "Package Details" msgstr "" @@ -2106,6 +2184,7 @@ msgstr "" msgid "" "{user} [1] merged {old} [2] into {new} [3].\n" "\n" +"-- \n" "If you no longer wish receive notifications about the new package, please go " "to [3] and click \"{label}\"." msgstr "" -- 2.25.0

1 1

[PATCH] Explain syntax/features in the comments section
by Lukas Fleischer 31 Jan '20

31 Jan '20

Addresses FS#64983. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/template/pkg_comment_form.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/template/pkg_comment_form.php b/web/template/pkg_comment_form.php index 3feee8f..e8a516e 100644 --- a/web/template/pkg_comment_form.php +++ b/web/template/pkg_comment_form.php @@ -8,6 +8,10 @@ <?php endif; ?> <input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" /> </div> + <p> + <?= __("Git commit identifiers referencing commits in the AUR package repository and URLs are converted to links automatically.") ?> + <?= __("%sMarkdown syntax%s is partially supported.", '<a href="https://daringfireball.net/projects/markdown/syntax">', "</a>") ?> + </p> <p> <textarea id="id_comment" name="comment" cols="80" rows="10"><?= (isset($comment_id)) ? htmlspecialchars($comment) : "" ?></textarea> </p> -- 2.25.0

1 0

[PATCH] Explain the hide email address setting
by Lukas Fleischer 31 Jan '20

31 Jan '20

Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/template/account_edit_form.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/web/template/account_edit_form.php b/web/template/account_edit_form.php index edacbbf..a4ea994 100644 --- a/web/template/account_edit_form.php +++ b/web/template/account_edit_form.php @@ -80,6 +80,14 @@ <em><?= __("Please ensure you correctly entered your email address, otherwise you will be locked out.") ?></em> </p> + <p> + <label for="id_hide"><?= __("Hide Email Address") ?>:</label> + <input type="checkbox" name="H" id="id_hide" <?= $H ? 'checked="checked"' : '' ?> /> + </p> + <p> + <em><?= __("If you do not hide your email address, it is visible to all registered AUR users. If you hide your email address, it is visible to members of the Arch Linux staff only.") ?></em> + </p> + <p> <label for="id_backup_email"><?= __("Backup Email Address") ?>:</label> <input type="text" size="30" maxlength="254" name="BE" id="id_backup_email" value="<?= htmlspecialchars($BE, ENT_QUOTES) ?>" /> @@ -88,14 +96,10 @@ <em> <?= __("Optionally provide a secondary email address that can be used to restore your account in case you lose access to your primary email address.") ?> <?= __("Password reset links are always sent to both your primary and your backup email address.") ?> + <?= __("Your backup email address is always only visible to members of the Arch Linux staff, independent of the %s setting.", "<em>" . __("Hide Email Address") . "</em>") ?> </em> </p> - <p> - <label for="id_hide"><?= __("Hide Email Address") ?>:</label> - <input type="checkbox" name="H" id="id_hide" <?= $H ? 'checked="checked"' : '' ?> /> - </p> - <p> <label for="id_realname"><?= __("Real Name") ?>:</label> <input type="text" size="30" maxlength="32" name="R" id="id_realname" value="<?= htmlspecialchars($R,ENT_QUOTES) ?>" /> -- 2.25.0

1 0

[PATCH] Add support for backup email addresses
by Lukas Fleischer 31 Jan '20

31 Jan '20

Support secondary email addresses that can be used to recover an account in case access to the primary email address is lost. Reset keys for an account are always sent to both the primary and the backup email address. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- aurweb/scripts/notify.py | 12 ++++++++---- schema/aur-schema.sql | 1 + upgrading/4.9.0.txt | 6 ++++++ web/html/account.php | 3 +++ web/html/login.php | 2 +- web/html/passreset.php | 6 +++--- web/html/register.php | 4 +++- web/lib/acctfuncs.inc.php | 15 +++++++++++---- web/template/account_edit_form.php | 12 +++++++++++- 9 files changed, 47 insertions(+), 14 deletions(-) diff --git a/aurweb/scripts/notify.py b/aurweb/scripts/notify.py index f2767fd..b0f218b 100755 --- a/aurweb/scripts/notify.py +++ b/aurweb/scripts/notify.py @@ -90,13 +90,17 @@ class Notification: class ResetKeyNotification(Notification): def __init__(self, conn, uid): - cur = conn.execute('SELECT UserName, Email, LangPreference, ' + - 'ResetKey FROM Users WHERE ID = ?', [uid]) - self._username, self._to, self._lang, self._resetkey = cur.fetchone() + cur = conn.execute('SELECT UserName, Email, BackupEmail, ' + + 'LangPreference, ResetKey ' + + 'FROM Users WHERE ID = ?', [uid]) + self._username, self._to, self._backup, self._lang, self._resetkey = cur.fetchone() super().__init__() def get_recipients(self): - return [(self._to, self._lang)] + if self._backup: + return [(self._to, self._lang), (self._backup, self._lang)] + else: + return [(self._to, self._lang)] def get_subject(self, lang): return self._l10n.translate('AUR Password Reset', lang) diff --git a/schema/aur-schema.sql b/schema/aur-schema.sql index fa991ba..1f86df2 100644 --- a/schema/aur-schema.sql +++ b/schema/aur-schema.sql @@ -23,6 +23,7 @@ CREATE TABLE Users ( Suspended TINYINT UNSIGNED NOT NULL DEFAULT 0, Username VARCHAR(32) NOT NULL, Email VARCHAR(254) NOT NULL, + BackupEmail VARCHAR(254) NULL DEFAULT NULL, HideEmail TINYINT UNSIGNED NOT NULL DEFAULT 0, Passwd VARCHAR(255) NOT NULL, Salt CHAR(32) NOT NULL DEFAULT '', diff --git a/upgrading/4.9.0.txt b/upgrading/4.9.0.txt index 4c79283..241f24a 100644 --- a/upgrading/4.9.0.txt +++ b/upgrading/4.9.0.txt @@ -4,3 +4,9 @@ ALTER TABLE PackageRequests ADD COLUMN ClosedTS BIGINT UNSIGNED NULL DEFAULT NULL; ALTER TABLE PackageRequests ADD COLUMN ClosedUID INTEGER UNSIGNED NULL DEFAULT NULL; ---- + +2. Add a new column to store backup email addresses: + +---- +ALTER TABLE Users ADD COLUMN BackupEmail VARCHAR(254) NULL DEFAULT NULL; +---- diff --git a/web/html/account.php b/web/html/account.php index ff9aba5..c05d136 100644 --- a/web/html/account.php +++ b/web/html/account.php @@ -33,6 +33,7 @@ if ($action == "UpdateAccount") { in_request("T"), in_request("S"), in_request("E"), + in_request("BE"), in_request("H"), in_request("P"), in_request("C"), @@ -97,6 +98,7 @@ if (isset($_COOKIE["AURSID"])) { $row["AccountTypeID"], $row["Suspended"], $row["Email"], + $row["BackupEmail"], $row["HideEmail"], "", "", @@ -159,6 +161,7 @@ if (isset($_COOKIE["AURSID"])) { in_request("T"), in_request("S"), in_request("E"), + in_request("BE"), in_request("H"), in_request("P"), in_request("C"), diff --git a/web/html/login.php b/web/html/login.php index df51705..0145441 100644 --- a/web/html/login.php +++ b/web/html/login.php @@ -26,7 +26,7 @@ html_header('AUR ' . __("Login")); <ul class="errorlist"><li><?= $login_error ?></li></ul> <?php endif; ?> <p> - <label for="id_username"><?= __('User name or email address') . ':'; ?></label> + <label for="id_username"><?= __('User name or primary email address') . ':'; ?></label> <input id="id_username" type="text" name="user" size="30" maxlength="<?= max(config_get_int('options', 'username_max_len'), 254); ?>" value="<?php if (isset($_POST['user'])) { print htmlspecialchars($_POST['user'], ENT_QUOTES); } ?>" autofocus="autofocus" /> </p> <p> diff --git a/web/html/passreset.php b/web/html/passreset.php index b3c8bd2..26b9bbb 100644 --- a/web/html/passreset.php +++ b/web/html/passreset.php @@ -65,7 +65,7 @@ html_header(__("Password Reset")); <form action="" method="post"> <table> <tr> - <td><?= __("Confirm your e-mail address:"); ?></td> + <td><?= __("Confirm your user name or primary e-mail address:"); ?></td> <td><input type="text" name="user" size="30" maxlength="64" /></td> </tr> <tr> @@ -81,14 +81,14 @@ html_header(__("Password Reset")); <input type="submit" class="button" value="<?= __('Continue') ?>" /> </form> <?php else: ?> - <p><?= __('If you have forgotten the e-mail address you used to register, please send a message to the %saur-general%s mailing list.', + <p><?= __('If you have forgotten the user name and the primary e-mail address you used to register, please send a message to the %saur-general%s mailing list.', '<a href="https://mailman.archlinux.org/mailman/listinfo/aur-general">', '</a>'); ?></p> <?php if ($error): ?> <ul class="errorlist"><li><?= $error ?></li></ul> <?php endif; ?> <form action="" method="post"> - <p><?= __("Enter your user name or your e-mail address:"); ?> + <p><?= __("Enter your user name or your primary e-mail address:"); ?> <input type="text" name="user" size="30" maxlength="64" /></p> <input type="submit" class="button" value="<?= __('Continue') ?>" /> </form> diff --git a/web/html/register.php b/web/html/register.php index 610befc..fee0a68 100644 --- a/web/html/register.php +++ b/web/html/register.php @@ -23,6 +23,7 @@ if (in_request("Action") == "NewAccount") { 1, 0, in_request("E"), + in_request("BE"), in_request("H"), '', '', @@ -52,6 +53,7 @@ if (in_request("Action") == "NewAccount") { 1, 0, in_request("E"), + in_request("BE"), in_request("H"), '', '', @@ -75,7 +77,7 @@ if (in_request("Action") == "NewAccount") { } } else { print '<p>' . __("Use this form to create an account.") . '</p>'; - display_account_form("NewAccount", "", "", "", "", "", "", "", "", $LANG); + display_account_form("NewAccount", "", "", "", "", "", "", "", "", "", $LANG); } echo '</div>'; diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php index f6cda69..443fb4b 100644 --- a/web/lib/acctfuncs.inc.php +++ b/web/lib/acctfuncs.inc.php @@ -46,6 +46,7 @@ function html_format_pgp_fingerprint($fingerprint) { * @param string $T The account type of the displayed user * @param string $S Whether the displayed user has a suspended account * @param string $E The e-mail address of the displayed user + * @param string $BE The backup e-mail address of the displayed user * @param string $H Whether the e-mail address of the displayed user is hidden * @param string $P The password value of the displayed user * @param string $C The confirmed password value of the displayed user @@ -67,7 +68,7 @@ function html_format_pgp_fingerprint($fingerprint) { * * @return void */ -function display_account_form($A,$U="",$T="",$S="",$E="",$H="",$P="",$C="",$R="", +function display_account_form($A,$U="",$T="",$S="",$E="",$BE="",$H="",$P="",$C="",$R="", $L="",$TZ="",$HP="",$I="",$K="",$PK="",$J="",$CN="",$UN="",$ON="",$UID=0,$N="",$captcha_salt="",$captcha="") { global $SUPPORTED_LANGS; @@ -95,6 +96,7 @@ function display_account_form($A,$U="",$T="",$S="",$E="",$H="",$P="",$C="",$R="" * @param string $T The account type for the user * @param string $S Whether or not the account is suspended * @param string $E The e-mail address for the user + * @param string $BE The backup e-mail address for the user * @param string $H Whether or not the e-mail address should be hidden * @param string $P The password for the user * @param string $C The confirmed password for the user @@ -117,7 +119,7 @@ function display_account_form($A,$U="",$T="",$S="",$E="",$H="",$P="",$C="",$R="" * * @return array Boolean indicating success and message to be printed */ -function process_account_form($TYPE,$A,$U="",$T="",$S="",$E="",$H="",$P="",$C="", +function process_account_form($TYPE,$A,$U="",$T="",$S="",$E="",$BE="",$H="",$P="",$C="", $R="",$L="",$TZ="",$HP="",$I="",$K="",$PK="",$J="",$CN="",$UN="",$ON="",$UID=0,$N="",$passwd="",$captcha_salt="",$captcha="") { global $SUPPORTED_LANGS; @@ -175,6 +177,9 @@ function process_account_form($TYPE,$A,$U="",$T="",$S="",$E="",$H="",$P="",$C="" if (!$error && !valid_email($E)) { $error = __("The email address is invalid."); } + if (!$error && $BE && !valid_email($BE)) { + $error = __("The backup email address is invalid."); + } if (!$error && !empty($HP) && !valid_homepage($HP)) { $error = __("The home page is invalid, please specify the full HTTP(s) URL."); @@ -311,6 +316,7 @@ function process_account_form($TYPE,$A,$U="",$T="",$S="",$E="",$H="",$P="",$C="" } $U = $dbh->quote($U); $E = $dbh->quote($E); + $BE = $dbh->quote($BE); $P = $dbh->quote($P); $R = $dbh->quote($R); $L = $dbh->quote($L); @@ -319,9 +325,9 @@ function process_account_form($TYPE,$A,$U="",$T="",$S="",$E="",$H="",$P="",$C="" $I = $dbh->quote($I); $K = $dbh->quote(str_replace(" ", "", $K)); $q = "INSERT INTO Users (AccountTypeID, Suspended, "; - $q.= "InactivityTS, Username, Email, Passwd , "; + $q.= "InactivityTS, Username, Email, BackupEmail, Passwd , "; $q.= "RealName, LangPreference, Timezone, Homepage, IRCNick, PGPKey) "; - $q.= "VALUES (1, 0, 0, $U, $E, $P, $R, $L, $TZ, "; + $q.= "VALUES (1, 0, 0, $U, $E, $BE, $P, $R, $L, $TZ, "; $q.= "$HP, $I, $K)"; $result = $dbh->exec($q); if (!$result) { @@ -374,6 +380,7 @@ function process_account_form($TYPE,$A,$U="",$T="",$S="",$E="",$H="",$P="",$C="" $q.= ", Suspended = 0"; } $q.= ", Email = " . $dbh->quote($E); + $q.= ", BackupEmail = " . $dbh->quote($BE); if ($H) { $q.= ", HideEmail = 1"; } else { diff --git a/web/template/account_edit_form.php b/web/template/account_edit_form.php index 09d65c0..edacbbf 100644 --- a/web/template/account_edit_form.php +++ b/web/template/account_edit_form.php @@ -76,11 +76,21 @@ <label for="id_email"><?= __("Email Address") ?>:</label> <input type="text" size="30" maxlength="254" name="E" id="id_email" value="<?= htmlspecialchars($E,ENT_QUOTES) ?>" /> (<?= __("required") ?>) </p> - <p> <em><?= __("Please ensure you correctly entered your email address, otherwise you will be locked out.") ?></em> </p> + <p> + <label for="id_backup_email"><?= __("Backup Email Address") ?>:</label> + <input type="text" size="30" maxlength="254" name="BE" id="id_backup_email" value="<?= htmlspecialchars($BE, ENT_QUOTES) ?>" /> + </p> + <p> + <em> + <?= __("Optionally provide a secondary email address that can be used to restore your account in case you lose access to your primary email address.") ?> + <?= __("Password reset links are always sent to both your primary and your backup email address.") ?> + </em> + </p> + <p> <label for="id_hide"><?= __("Hide Email Address") ?>:</label> <input type="checkbox" name="H" id="id_hide" <?= $H ? 'checked="checked"' : '' ?> /> -- 2.25.0

1 0

[PATCH] rendercomment: add a test for Git commit links
by Frédéric Mangano-Tarumi 31 Jan '20

31 Jan '20

--- test/t2600-rendercomment.sh | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/test/t2600-rendercomment.sh b/test/t2600-rendercomment.sh index edf290c..7b3a4a8 100755 --- a/test/t2600-rendercomment.sh +++ b/test/t2600-rendercomment.sh @@ -63,4 +63,33 @@ test_expect_success 'Test link conversion.' ' test_cmp actual expected ' +test_expect_success 'Test Git commit linkification.' ' + local oid=`git -C aur.git rev-parse --verify HEAD` + cat <<-EOD | sqlite3 aur.db && + INSERT INTO PackageComments (ID, PackageBaseID, Comments, RenderedComment) VALUES (5, 1, " + $oid + ${oid:0:7} + x.$oid.x + ${oid}x + 0123456789abcdef + \`$oid\` + http://example.com/$oid + ", ""); + EOD + "$RENDERCOMMENT" 5 && + cat <<-EOD >expected && + <p><a href="https://aur.archlinux.org/cgit/aur.git/log/?h=foobar&id=${oid:0:12}">${oid:0:12}</a> + <a href="https://aur.archlinux.org/cgit/aur.git/log/?h=foobar&id=${oid:0:7}">${oid:0:7}</a> + x.<a href="https://aur.archlinux.org/cgit/aur.git/log/?h=foobar&id=${oid:0:12}">${oid:0:12}</a>.x + ${oid}x + 0123456789abcdef + <code>$oid</code> + <a href="http://example.com/$oid">http://example.com/$oid</a></p> + EOD + cat <<-EOD | sqlite3 aur.db >actual && + SELECT RenderedComment FROM PackageComments WHERE ID = 5; + EOD + test_cmp actual expected +' + test_done -- 2.25.0

2 1

[PATCH] rendercomment: respectful linkification of git commits
by Frédéric Mangano-Tarumi 31 Jan '20

31 Jan '20

Turn the git-commits markdown processor into an inline processor, which is smart enough not to convert Git hashes contained in code blocks or links. --- aurweb/scripts/rendercomment.py | 36 ++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/aurweb/scripts/rendercomment.py b/aurweb/scripts/rendercomment.py index 5e18fd5..ad39ceb 100755 --- a/aurweb/scripts/rendercomment.py +++ b/aurweb/scripts/rendercomment.py @@ -40,19 +40,26 @@ class FlysprayLinksExtension(markdown.extensions.Extension): md.preprocessors.add('flyspray-links', preprocessor, '_end') -class GitCommitsPreprocessor(markdown.preprocessors.Preprocessor): - _oidre = re.compile(r'(\b)([0-9a-f]{7,40})(\b)') +class GitCommitsInlineProcessor(markdown.inlinepatterns.InlineProcessor): + """ + Turn Git hashes like “f7f5152be5ab” into links to AUR’s cgit. + + Only commit references that do exist are linkified. Hashes are shortened to + shorter non-ambiguous prefixes. Only hashes with at least 7 digits are + considered. + """ + _repo = pygit2.Repository(repo_path) - _head = None def __init__(self, md, head): self._head = head - super(markdown.preprocessors.Preprocessor, self).__init__(md) + super().__init__(r'\b([0-9a-f]{7,40})\b', md) - def handleMatch(self, m): - oid = m.group(2) + def handleMatch(self, m, data): + oid = m.group(1) if oid not in self._repo: - return oid + # Unkwown OID; preserve the orginal text. + return None, None, None prefixlen = 12 while prefixlen < 40: @@ -60,13 +67,10 @@ class GitCommitsPreprocessor(markdown.preprocessors.Preprocessor): break prefixlen += 1 - html = '[`' + oid[:prefixlen] + '`]' - html += '(' + commit_uri % (self._head, oid[:prefixlen]) + ')' - - return html - - def run(self, lines): - return [self._oidre.sub(self.handleMatch, line) for line in lines] + el = markdown.util.etree.Element('a') + el.set('href', commit_uri % (self._head, oid[:prefixlen])) + el.text = markdown.util.AtomicString(oid[:prefixlen]) + return el, m.start(0), m.end(0) class GitCommitsExtension(markdown.extensions.Extension): @@ -77,8 +81,8 @@ class GitCommitsExtension(markdown.extensions.Extension): super(markdown.extensions.Extension, self).__init__() def extendMarkdown(self, md, md_globals): - preprocessor = GitCommitsPreprocessor(md, self._head) - md.preprocessors.add('git-commits', preprocessor, '_end') + processor = GitCommitsInlineProcessor(md, self._head) + md.inlinePatterns.add('git-commits', processor, '_end') class HeadingTreeprocessor(markdown.treeprocessors.Treeprocessor): -- 2.25.0

2 2