Author: eelco
Date: Fri Feb 3 17:44:00 2012
New Revision: 31995
URL: https://nixos.org/websvn/nix/?rev=31995&sc=1
Log:
* Drop support for IP-based authorisation.
Modified:
services/trunk/subversion/default.nix
services/trunk/subversion/src/scripts/cgi-bin/repoman.pl
Modified: services/trunk/subversion/default.nix
==============================================================================
--- services/trunk/subversion/default.nix Fri Feb 3 17:15:18 2012
(r31994)
+++ services/trunk/subversion/default.nix Fri Feb 3 17:44:00 2012
(r31995)
@@ -37,7 +37,7 @@
inherit reposDir dbDir logDir distsDir backupsDir tmpDir
urlPrefix adminAddr fsType subversion postCommitHook mailer;
- inherit (config) notificationSender userCreationDomain;
+ inherit (config) notificationSender;
orgUrl = config.organisation.url;
orgLogoUrl = config.organisation.logo;
orgName = config.organisation.name;
@@ -209,12 +209,8 @@
</Location>
<Location ${urlPrefix}/repoman/adduser>
- ${commonAuth}
+ ${commonAuth}
Require valid-user
- #Order deny,allow
- #Deny from all
- #Allow from 127.0.0.1
- #Allow from ${config.userCreationDomain}
</Location>
<Location ${urlPrefix}/repoman/edituser>
@@ -225,10 +221,6 @@
<Location ${urlPrefix}/repoman/create>
${commonAuth}
Require valid-user
- #Order deny,allow
- #Deny from all
- #Allow from 127.0.0.1
- #Allow from ${config.userCreationDomain}
</Location>
<Location ${urlPrefix}/repoman/update>
@@ -403,16 +395,6 @@
";
};
- userCreationDomain = mkOption {
- default = "example.org";
- example = "example.org";
- description = "
- The domain from which user creation is allowed. A client can
- only create a new user account if its IP address resolves to
- this domain.
- ";
- };
-
autoVersioning = mkOption {
default = false;
description = "
Modified: services/trunk/subversion/src/scripts/cgi-bin/repoman.pl
==============================================================================
--- services/trunk/subversion/src/scripts/cgi-bin/repoman.pl Fri Feb 3
17:15:18 2012 (r31994)
+++ services/trunk/subversion/src/scripts/cgi-bin/repoman.pl Fri Feb 3
17:44:00 2012 (r31995)
@@ -160,6 +160,7 @@
# Check whether the user has the given right.
sub hasRight {
my ($right) = @_;
+ return 0 unless defined $userName;
my $rights = getDB($rightsdb, $userName);
foreach my $r (split /[, ]+/, $rights) {
return 1 if $r eq $right;
@@ -322,13 +323,11 @@
print start_ul;
print start_li;
print "You can ";
- print a({href => $base . "/adduser"}, "add a new user"),
- " (only within the ", tt("@userCreationDomain@"), " domain).";
+ print a({href => $base . "/adduser"}, "add a new user"), ".";
print end_li;
print start_li;
print "You can ";
- print a({href => $base . "/create"}, "create a new repository"),
- " (only within the ", tt("@userCreationDomain@"), " domain).";
+ print a({href => $base . "/create"}, "create a new repository"), ".";
print end_li;
print start_li;
print "You can ";
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
