projects
/
BackupPC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added only_increment checkbox
[BackupPC.git]
/
lib
/
BackupPC
/
CGI
/
Lib.pm
diff --git
a/lib/BackupPC/CGI/Lib.pm
b/lib/BackupPC/CGI/Lib.pm
index
44afe9d
..
9861acc
100644
(file)
--- a/
lib/BackupPC/CGI/Lib.pm
+++ b/
lib/BackupPC/CGI/Lib.pm
@@
-29,7
+29,7
@@
#
#========================================================================
#
#
#========================================================================
#
-# Version 3.2.0
beta0, released 5 April 2009
.
+# Version 3.2.0
, released 31 Jul 2010
.
#
# See http://backuppc.sourceforge.net.
#
#
# See http://backuppc.sourceforge.net.
#
@@
-134,6
+134,11
@@
sub NewRequest
#
$User = $1 if ( $User =~ /uid=([^,]+)/i || $User =~ /(.*)/ );
#
$User = $1 if ( $User =~ /uid=([^,]+)/i || $User =~ /(.*)/ );
+ # strip Active directory domain in front of user
+ $User = $1 if ( $User =~ /\w+\\(\w+)/ );
+#use Data::Dump qw(dump);
+#warn "XX User: $User",dump( \%ENV );
+
#
# Clean up %ENV for taint checking
#
#
# Clean up %ENV for taint checking
#
@@
-354,6
+359,10
@@
sub CheckPermission
$Privileged ||= $User eq $Hosts->{$host}{user};
$Privileged ||= defined($Hosts->{$host}{moreUsers}{$User});
$Privileged ||= $User eq $Hosts->{$host}{user};
$Privileged ||= defined($Hosts->{$host}{moreUsers}{$User});
+
+ # XXX check against REMOTE_NTGROUP from mod_ntlm
+ $Privileged ||= $Conf{CgiAdminUserGroup} eq $ENV{REMOTE_NTGROUP};
+
return $Privileged;
}
return $Privileged;
}
@@
-437,6
+446,11
@@
sub Header
priv => 1},
{ link => "?action=queue", name => $Lang->{Current_queues},
priv => 1},
priv => 1},
{ link => "?action=queue", name => $Lang->{Current_queues},
priv => 1},
+ # XXX additional search extensions
+ { link => "?action=search", name => $Lang->{Search_archive},
+ priv => 0},
+ { link => "?action=burn", name => $Lang->{Burn_media},
+ priv => 1},
@{$Conf{CgiNavBarLinks} || []},
);
my $host = $In{host};
@{$Conf{CgiNavBarLinks} || []},
);
my $host = $In{host};
@@
-452,7
+466,10
@@
sub Header
$Conf{CgiHeaders}
<script src="$Conf{CgiImageDirURL}/sorttable.js"></script>
</head><body onLoad="document.getElementById('NavMenu').style.height=document.body.scrollHeight">
$Conf{CgiHeaders}
<script src="$Conf{CgiImageDirURL}/sorttable.js"></script>
</head><body onLoad="document.getElementById('NavMenu').style.height=document.body.scrollHeight">
+<!--
<a href="http://backuppc.sourceforge.net"><img src="$Conf{CgiImageDirURL}/logo.gif" hspace="5" vspace="7" border="0"></a><br>
<a href="http://backuppc.sourceforge.net"><img src="$Conf{CgiImageDirURL}/logo.gif" hspace="5" vspace="7" border="0"></a><br>
+-->
+<img src="/asa-150x50.png" hspace="5" vspace="7">
EOF
if ( defined($Hosts) && defined($host) && defined($Hosts->{$host}) ) {
EOF
if ( defined($Hosts) && defined($host) && defined($Hosts->{$host}) ) {