michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 14:13:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Work on support for doing two-factor entirely within usermin

Browse Source
This commit is contained in:
Jamie Cameron
2021-05-23 20:35:33 -07:00
parent cde5422058
commit 87a2f5d635
3 changed files with 62 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
usermin/edit_twofactor.cgi
View File

@@ -7,6 +7,10 @@ get_usermin_miniserv_config(\%miniserv);
$miniserv{'session'} || &error($text{'twofactor_esession'});
print "$text{'twofactor_desc'}<p>\n";
$root = &get_usermin_root_directory();
if (!-r $root."/twofactor") {
&ui_print_endpage("<b>$text{'twofactor_eversion'}</b>");
}
print <<EOF;
<style>

2
usermin/lang/en
View File

@@ -500,6 +500,6 @@ copycert_essl=SSL is not enabled
copycert_ekeyfile=No private key file is set in Webmin
twofactor_desc=Two-factor authentication allows Usermin users to enable use of an additional authentication device when logging in, such as a one-time passcode generator. Users must individually enroll with the selected authentication provider after it is enabled on this page.
twofactor_eversion=The version of Usermin installed on your system does not support two-factor authentication.
__norefs=1

57
usermin/usermin-lib.pl
View File

@@ -144,6 +144,18 @@ sub put_usermin_config
&write_file($usermin_config, \%usermin_config_cache);
}
=head2 get_usermin_root_directory
Returns the Usermin install root directory.
=cut
sub get_usermin_root_directory
{
my %miniserv;
&get_usermin_miniserv_config(\%miniserv);
return $miniserv{'root'};
}
=head2 list_themes
Returns an array of all usermin themes. The format is the same as the
@@ -1017,5 +1029,50 @@ if (!$found && $prov) {
&unlock_file($miniserv{'twofactorfile'});
}
=head2 create_cron_wrapper(wrapper-path, module, script)
Creates a wrapper script which calls a script in some module's directory
with the proper usermin environment variables set.
The parameters are :
=item wrapper-path - Full path to the wrapper to create, like /etc/usermin/yourmodule/foo.pl
=item module - Module containing the real script to call.
=item script - Program within that module for the wrapper to run.
=cut
sub create_cron_wrapper
{
my ($wrapper, $mod, $script) = @_;
my $perl_path = &get_perl_path();
&open_tempfile(CMD, ">$wrapper");
&print_tempfile(CMD, <<EOF
#!$perl_path
open(CONF, "<$usermin_miniserv_config") || die "Failed to open $usermin_miniserv_config : \$!";
while(<CONF>) {
\$root = \$1 if (/^root=(.*)/);
}
close(CONF);
\$root || die "No root= line found in $usermin_miniserv_config";
\$ENV{'PERLLIB'} = "\$root";
\$ENV{'WEBMIN_CONFIG'} = "$config{'usermin_dir'}";
\$ENV{'WEBMIN_VAR'} = "$ENV{'WEBMIN_VAR'}";
delete(\$ENV{'MINISERV_CONFIG'});
EOF
);
if ($mod) {
&print_tempfile(CMD, "chdir(\"\$root/$mod\");\n");
&print_tempfile(CMD, "exec(\"\$root/$mod/$script\", \@ARGV) || die \"Failed to run \$root/$mod/$script : \$!\";\n");
}
else {
&print_tempfile(CMD, "chdir(\"\$root\");\n");
&print_tempfile(CMD, "exec(\"\$root/$script\", \@ARGV) || die \"Failed to run \$root/$script : \$!\";\n");
}
&close_tempfile(CMD);
chmod(0755, $wrapper);
}
1;