michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-04-17 22:50:27 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Strict and warnings compliance

Browse Source
This commit is contained in:
Jamie Cameron
2014-11-29 14:30:15 -08:00
parent 56ae0eca2e
commit ea32cfc6ee
1 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
htaccess-htpasswd/htaccess-lib.pl
View File

@@ -1,20 +1,25 @@
# htaccess-lib.pl
# Common functions for the htaccess and htpasswd file management module
use strict;
use warnings;
our (%config, %module_info, @remote_user_info, $user_module_config_directory,
$remote_user, $module_config_directory);
BEGIN { push(@INC, ".."); };
use WebminCore;
&init_config();
do 'htpasswd-file-lib.pl';
@accessdirs = ( );
our ($default_dir, @accessdirs, $directories_file, $apachemod,
$can_htpasswd, $can_htgroups, $can_create, $can_sync, %access);
our ($old_uid, $old_gid);
if ($module_info{'usermin'}) {
# Allowed directories are in module configuration
&switch_to_remote_user();
&create_user_config_dirs();
$default_dir = &resolve_links($remote_user_info[7]);
push(@accessdirs, $default_dir) if ($config{'home'});
local $d;
foreach $d (split(/\t+/, $config{'dirs'})) {
foreach my $d (split(/\t+/, $config{'dirs'})) {
push(@accessdirs, $d =~ /^\// ? $d : "$default_dir/$d");
}
@accessdirs = &expand_root_variables(@accessdirs);
@@ -27,16 +32,15 @@ if ($module_info{'usermin'}) {
else {
# Allowed directories come from ACL
%access = &get_module_acl();
local @uinfo;
if (&supports_users()) {
my @uinfo;
if (&supports_users() && $access{'home'} && $remote_user) {
# Include user home
@uinfo = getpwnam($remote_user);
if ($access{'home'} && scalar(@uinfo)) {
if (scalar(@uinfo)) {
push(@accessdirs, &resolve_links($uinfo[7]));
}
}
local $d;
foreach $d (split(/\t+/, $access{'dirs'})) {
foreach my $d (split(/\t+/, $access{'dirs'})) {
push(@accessdirs, $d =~ /^\// || !@uinfo ?
$d : &resolve_links("$uinfo[7]/$d"));
}
@@ -55,17 +59,18 @@ else {
# users file, encryption mode, sync mode and groups file for each
sub list_directories
{
local @rv;
open(DIRS, $directories_file);
while(<DIRS>) {
my @rv;
my $fh;
open($fh, $directories_file);
while(<$fh>) {
s/\r|\n//g;
local @dir = split(/\t+/, $_);
my @dir = split(/\t+/, $_);
next if (!@dir);
if ($_[0] || -d $dir[0] && -r "$dir[0]/$config{'htaccess'}") {
push(@rv, \@dir);
}
}
closedir(DIRS);
close($fh);
return @rv;
}
@@ -74,12 +79,13 @@ return @rv;
# returned by list_directories
sub save_directories
{
local $d;
&open_tempfile(DIRS, ">$directories_file");
my $d;
my $fh = "DIRS";
&open_tempfile($fh, ">$directories_file");
foreach $d (@{$_[0]}) {
&print_tempfile(DIRS, join("\t", @$d),"\n");
&print_tempfile($fh, join("\t", @$d),"\n");
}
&close_tempfile(DIRS);
&close_tempfile($fh);
}
# can_access_dir(dir)
@@ -87,7 +93,7 @@ foreach $d (@{$_[0]}) {
sub can_access_dir
{
return 1 if (!$ENV{'GATEWAY_INTERFACE'});
local $d;
my $d;
foreach $d (@accessdirs) {
return 1 if (&is_under_directory(&resolve_links($d),
&resolve_links($_[0])));
@@ -102,7 +108,7 @@ sub switch_user
{
if (!$module_info{'usermin'} &&
$access{'user'} ne 'root' && !defined($old_uid) && &supports_users()) {
local @uinfo = getpwnam($access{'user'} eq "*" ? $remote_user
my @uinfo = getpwnam($access{'user'} eq "*" ? $remote_user
: $access{'user'});
$old_uid = $>;
$old_gid = $);
@@ -124,8 +130,8 @@ if (defined($old_uid)) {
# Replaces $USER and $HOME in a list of dirs
sub expand_root_variables
{
local @rv;
local %hash = ( 'user' => $remote_user_info[0],
my @rv;
my %hash = ( 'user' => $remote_user_info[0],
'home' => $remote_user_info[7],
'uid' => $remote_user_info[2],
'gid' => $remote_user_info[3] );