[lintian] 01/01: c/fields: Use HTTPS in canonical URLs
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository lintian.
commit 97c9b5ff9bc7bca19344626c6244c63559617597
Author: Niels Thykier <niels@thykier.net>
Date: Sun Apr 10 07:11:18 2016 +0000
c/fields: Use HTTPS in canonical URLs
This is more efficient than flagging it and then flagging the
correction as insecure.
Signed-off-by: Niels Thykier <niels@thykier.net>
---
checks/fields.pm | 38 +++++++++++++++---------------
debian/changelog | 1 +
t/tests/fields-uncanonical-vcs-fields/tags | 8 +++----
3 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/checks/fields.pm b/checks/fields.pm
index edbc06f..7e0962c 100644
--- a/checks/fields.pm
+++ b/checks/fields.pm
@@ -128,12 +128,12 @@ my %VCS_EXTRACT = (
my %VCS_CANONIFY = (
browser => sub {
$_[0] =~ s{https?://svn\.debian\.org/wsvn/}
- {http://anonscm.debian.org/viewvc/};
- $_[0] =~ s{\Qhttp://git.debian.org/?p=\E}
- {https://anonscm.debian.org/cgit/};
- $_[0] =~ s{\Qhttp://bzr.debian.org/loggerhead/\E}
- {http://anonscm.debian.org/loggerhead/};
- if ($_[0] =~ m{\Qhttp://anonscm.debian.org/viewvc/\E}xsm) {
+ {https://anonscm.debian.org/viewvc/};
+ $_[0] =~ s{https?\Q://git.debian.org/?p=\E}
+ {https://anonscm.debian.org/git/};
+ $_[0] =~ s{https?\Q://bzr.debian.org/loggerhead/\E}
+ {https://anonscm.debian.org/loggerhead/};
+ if ($_[0] =~ m{https?\Q://anonscm.debian.org/viewvc/\E}xsm) {
if ($_[0] =~ s{\?(.*[;\&])?op=log(?:[;\&](.*))?\Z}{}xsm) {
my (@keep) = ($1, $2, $3);
my $final = join('', grep {defined} @keep);
@@ -152,25 +152,25 @@ my %VCS_CANONIFY = (
$_[0] =~ s{\@cvs.alioth.debian.org:/cvs/}{\@anonscm.debian.org:/cvs/};
},
arch => sub {
- $_[0] =~ s{\Qhttp://arch.debian.org/arch/\E}
- {http://anonscm.debian.org/arch/};
+ $_[0] =~ s{https?\Q://arch.debian.org/arch/\E}
+ {https://anonscm.debian.org/arch/};
},
bzr => sub {
- $_[0] =~ s{\Qhttp://bzr.debian.org/\E}
- {http://anonscm.debian.org/bzr/};
- $_[0] =~ s{\Qhttp://anonscm.debian.org/bzr/bzr/\E}
- {http://anonscm.debian.org/bzr/};
+ $_[0] =~ s{https?\Q://bzr.debian.org/\E}
+ {https://anonscm.debian.org/bzr/};
+ $_[0] =~ s{https?\Q://anonscm.debian.org/bzr/bzr/\E}
+ {https://anonscm.debian.org/bzr/};
},
git => sub {
if (
$_[0] =~ s{git://(?:git|anonscm)\.debian\.org/~}
- {git://anonscm.debian.org/users/}
+ {https://anonscm.debian.org/git/users/}
) {
$_[1] = 'vcs-git-uses-invalid-user-uri';
}
- $_[0] =~ s{\Qhttp://git.debian.org/\E}
+ $_[0] =~ s{https?\Q://git.debian.org/\E}
{https://anonscm.debian.org/git/};
- $_[0] =~ s{\Qhttp://anonscm.debian.org/git/git/\E}
+ $_[0] =~ s{https?\Q://anonscm.debian.org/git/git/\E}
{https://anonscm.debian.org/git/};
$_[0] =~ s{\Qgit://git.debian.org/\E}
{https://anonscm.debian.org/git/};
@@ -178,10 +178,10 @@ my %VCS_CANONIFY = (
{https://anonscm.debian.org/git/};
},
hg => sub {
- $_[0] =~ s{\Qhttp://hg.debian.org/\E}
- {http://anonscm.debian.org/hg/};
- $_[0] =~ s{\Qhttp://anonscm.debian.org/hg/hg/\E}
- {http://anonscm.debian.org/hg/};
+ $_[0] =~ s{https?\Q://hg.debian.org/\E}
+ {https://anonscm.debian.org/hg/};
+ $_[0] =~ s{https?\Q://anonscm.debian.org/hg/hg/\E}
+ {https://anonscm.debian.org/hg/};
},
svn => sub {
$_[0] =~ s{\Qsvn://cvs.alioth.debian.org/\E}
diff --git a/debian/changelog b/debian/changelog
index 826a8cf..08f7a1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ lintian (2.5.44) UNRELEASED; urgency=medium
+ [NT] Expand the vcs-field-uses-insecure-uri check to check other
known insecure protocols (e.g. svn and pserver). Thanks to Paul
"(UTF-8) Snowman" Tagliamonte for the report. (Closes: #812962)
+ + [NT] Use https URL in the correction for canonical VCS URLs.
* checks/nmu.{desc,pm}:
+ [NT] Create a separate tag for extra whitespace around uploader name
in the changelog. Thanks to Ben Wiederhake for the suggestion.
diff --git a/t/tests/fields-uncanonical-vcs-fields/tags b/t/tests/fields-uncanonical-vcs-fields/tags
index f9b9e8f..283cc63 100644
--- a/t/tests/fields-uncanonical-vcs-fields/tags
+++ b/t/tests/fields-uncanonical-vcs-fields/tags
@@ -1,5 +1,5 @@
-I: fields-uncanonical-vcs-fields source: vcs-field-not-canonical http://hg.debian.org/hg/foobar/pkg/foobar http://anonscm.debian.org/hg/foobar/pkg/foobar
-I: fields-uncanonical-vcs-fields source: vcs-field-not-canonical nosmart+http://bzr.debian.org/bzr/collab-maint/foobar nosmart+http://anonscm.debian.org/bzr/collab-maint/foobar
+I: fields-uncanonical-vcs-fields source: vcs-field-not-canonical http://hg.debian.org/hg/foobar/pkg/foobar https://anonscm.debian.org/hg/foobar/pkg/foobar
+I: fields-uncanonical-vcs-fields source: vcs-field-not-canonical nosmart+http://bzr.debian.org/bzr/collab-maint/foobar nosmart+https://anonscm.debian.org/bzr/collab-maint/foobar
I: fields-uncanonical-vcs-fields source: vcs-field-not-canonical svn://svn.debian.org/svn/foobar/trunk svn://anonscm.debian.org/foobar/trunk
I: fields-uncanonical-vcs-fields source: vcs-field-uses-insecure-uri vcs-bzr nosmart+http://bzr.debian.org/bzr/collab-maint/foobar
I: fields-uncanonical-vcs-fields source: vcs-field-uses-insecure-uri vcs-cvs :pserver:anonymous@cvs.alioth.debian.org:/cvsroot/foobar module
@@ -7,5 +7,5 @@ I: fields-uncanonical-vcs-fields source: vcs-field-uses-insecure-uri vcs-git git
I: fields-uncanonical-vcs-fields source: vcs-field-uses-insecure-uri vcs-hg http://hg.debian.org/hg/foobar/pkg/foobar
I: fields-uncanonical-vcs-fields source: vcs-field-uses-insecure-uri vcs-svn svn://svn.debian.org/svn/foobar/trunk
W: fields-uncanonical-vcs-fields source: vcs-field-bitrotted :pserver:anonymous@cvs.alioth.debian.org:/cvsroot/foobar :pserver:anonymous@anonscm.debian.org:/cvs/foobar
-W: fields-uncanonical-vcs-fields source: vcs-field-bitrotted https://svn.debian.org/wsvn/foobar/trunk?foo=bar;op=log;something=else http://anonscm.debian.org/viewvc/foobar/trunk?foo=bar;something=else
-W: fields-uncanonical-vcs-fields source: vcs-git-uses-invalid-user-uri git://git.debian.org/~djpig/foobar.git git://anonscm.debian.org/users/djpig/foobar.git
+W: fields-uncanonical-vcs-fields source: vcs-field-bitrotted https://svn.debian.org/wsvn/foobar/trunk?foo=bar;op=log;something=else https://anonscm.debian.org/viewvc/foobar/trunk?foo=bar;something=else
+W: fields-uncanonical-vcs-fields source: vcs-git-uses-invalid-user-uri git://git.debian.org/~djpig/foobar.git https://anonscm.debian.org/git/users/djpig/foobar.git
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: