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

strict and ui-lib conversion

Browse Source
This commit is contained in:
Jamie Cameron
2014-01-23 10:08:07 -08:00
parent a4bf4d5d3b
commit f285b1824a
5 changed files with 63 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tunnel/index.cgi
View File

@@ -1,9 +1,14 @@
#!/usr/local/bin/perl
# Either redirects to link.cgi, if a URL has been set, or asks for a URL
use strict;
use warnings;
our (%config, %text, %module_info);
require './tunnel-lib.pl';
if ($config{'url'}) {
$config{'url'} = &fix_end_url($config{'url'}) || &error($text{'seturl_eurl'});
$config{'url'} = &fix_end_url($config{'url'}) ||
&error($text{'seturl_eurl'});
&redirect("link.cgi/$config{'url'}");
}
else {

86
tunnel/link.cgi
View File

@@ -2,32 +2,35 @@
# link.cgi
# Forward the URL from path_info on to another webmin server
use strict;
use warnings;
our (%config, %text, %module_info, %in, %gconfig, $module_name);
require './tunnel-lib.pl';
#$ENV{'PATH_INFO'} =~ /^\/(.*)$/ ||
# &error("Bad PATH_INFO : $ENV{'PATH_INFO'}");
$ENV{'PATH_INFO'} =~ /^\/(http|https):\/+([^:\/]+)(:(\d+))?(.*)$/ ||
&error("Bad PATH_INFO : $ENV{'PATH_INFO'}");
$protocol = $1;
$ssl = $protocol eq "https";
$host = $2;
$port = $4 || ( !$ssl ? 80 : 443 );
$path = $5 || "/";
$openurl = "$1://$2$3$5";
$baseurl = "$1://$2$3";
my $protocol = $1;
my $ssl = $protocol eq "https";
my $host = $2;
my $port = $4 || ( !$ssl ? 80 : 443 );
my $path = $5 || "/";
my $openurl = "$1://$2$3$5";
my $baseurl = "$1://$2$3";
if ($ENV{'QUERY_STRING'}) {
$path .= '?'.$ENV{'QUERY_STRING'};
}
elsif (@ARGV) {
$path .= '?'.join('+', @ARGV);
}
$linkurl = $gconfig{'webprefix'}."/$module_name/link.cgi/";
$url = $gconfig{'webprefix'}."/$module_name/link.cgi/$openurl";
my $linkurl = $gconfig{'webprefix'}."/$module_name/link.cgi/";
my $url = $gconfig{'webprefix'}."/$module_name/link.cgi/$openurl";
$| = 1;
$meth = $ENV{'REQUEST_METHOD'};
my $meth = $ENV{'REQUEST_METHOD'};
if ($config{'url'}) {
$openurl = &fix_end_url($config{'url'}) || &error($text{'seturl_eurl'});
}
my ($user, $pass);
if ($config{'loginmode'} == 2) {
# Login is variable .. check if we have it yet
if ($ENV{'HTTP_COOKIE'} =~ /tunnel=([^\s;]+)/) {
@@ -38,22 +41,20 @@ if ($config{'loginmode'} == 2) {
# No - need to display a login form
&ui_print_header(undef, $text{'login_title'}, "");
print "<center>",&text('login_desc', "<tt>$openurl</tt>"),
"</center><p>\n";
print "<form action=/$module_name/login.cgi method=post>\n";
print "<input type=hidden name=url value='",
&html_escape($openurl),"'>\n";
print "<center><table border>\n";
print "<tr $tb> <td><b>$text{'login_header'}</b></td> </tr>\n";
print "<tr $cb> <td><table cellpadding=2>\n";
print "<tr> <td><b>$text{'login_user'}</b></td>\n";
print "<td><input name=user size=20></td> </tr>\n";
print "<tr> <td><b>$text{'login_pass'}</b></td>\n";
print "<td><input name=pass size=20 type=password></td>\n";
print "</tr> </table></td></tr></table>\n";
print "<input type=submit value='$text{'login_login'}'>\n";
print "<input type=reset value='$text{'login_clear'}'>\n";
print "</center></form>\n";
print "<center>\n";
print &text('login_desc', "<tt>$openurl</tt>"),"<p>\n";
print &ui_form_start("/$module_name/login.cgi", "post");
print &ui_hidden("url", $openurl);
print &ui_table_start($text{'login_header'}, undef, 2);
print &ui_table_row($text{'login_user'},
&ui_textbox("user", undef, 20));
print &ui_table_row($text{'login_pass'},
&ui_password("pass", undef, 20));
print &ui_table_end();
print &ui_form_end([ [ undef, $text{'login_login'} ] ]);
print "</center>\n";
&ui_print_footer("", $text{'index_return'});
exit;
@@ -66,14 +67,14 @@ elsif ($config{'loginmode'} == 1) {
}
# Connect to the server
$con = &make_http_connection($host, $port, $ssl, $meth, $path);
my $con = &make_http_connection($host, $port, $ssl, $meth, $path);
&error($con) if (!ref($con));
# Send request headers
&write_http_connection($con, "Host: $host\r\n");
&write_http_connection($con, "User-Agent: Webmin\r\n");
if ($user) {
$auth = &encode_base64("$user:$pass");
my $auth = &encode_base64("$user:$pass");
$auth =~ s/\n//g;
&write_http_connection($con, "Authorization: Basic $auth\r\n");
}
@@ -81,19 +82,22 @@ if ($user) {
"Webmin-servers: %s://%s:%d/$module_name/\n",
$ENV{'HTTPS'} eq "ON" ? "https" : "http",
$ENV{'SERVER_NAME'}, $ENV{'SERVER_PORT'}));
$cl = $ENV{'CONTENT_LENGTH'};
my $cl = $ENV{'CONTENT_LENGTH'};
&write_http_connection($con, "Content-Length: $cl\r\n") if ($cl);
&write_http_connection($con, "Content-Type: $ENV{'CONTENT_TYPE'}\r\n")
if ($ENV{'CONTENT_TYPE'});
&write_http_connection($con, "\r\n");
if ($cl) {
&read_fully(STDIN, \$post, $cl);
my $post;
&read_fully(\*STDIN, \$post, $cl);
&write_http_connection($con, $post);
}
# read back the headers
$dummy = &read_http_connection($con);
my $dummy = &read_http_connection($con);
my ($headers, %header);
while(1) {
my $headline;
($headline = &read_http_connection($con)) =~ s/\r|\n//g;
last if (!$headline);
$headline =~ /^(\S+):\s+(.*)$/ || &error("Bad header");
@@ -101,14 +105,14 @@ while(1) {
$headers .= $headline."\n";
}
$defport = $ssl ? 443 : 80;
my $defport = $ssl ? 443 : 80;
if ($header{'location'}) {
# fix a redirect
&redirect("/$module_name/link.cgi/$header{'location'}");
exit;
}
if ($header{'location'} =~ /^(http|https):\/\/$host:$port$page(.*)$/ ||
$header{'location'} =~ /^(http|https):\/\/$host$page(.*)/ &&
if ($header{'location'} =~ /^(http|https):\/\/$host:$port$path(.*)$/ ||
$header{'location'} =~ /^(http|https):\/\/$host$path(.*)/ &&
$port == $defport) {
# fix a redirect
&redirect("$url/$2");
@@ -181,15 +185,15 @@ if ($header{'content-type'} =~ /text\/html/ && !$header{'x-no-links'}) {
s/action="((http|https):\/\/[^"]*)"/action="$linkurl$1"/gi;
s/action=((http|https):\/\/[^ "'>]*)/action=$linkurl$1/gi;
#s/\.location\s*=\s*'$page([^']*)'/.location='$url\/$1'/gi;
#s/\.location\s*=\s*"$page([^']*)"/.location="$url\/$1"/gi;
#s/window.open\("$page([^"]*)"/window.open\("$url\/$1"/gi;
#s/name=return\s+value="$page([^"]*)"/name=return value="$url\/$1"/gi;
#s/\.location\s*=\s*'$path([^']*)'/.location='$url\/$1'/gi;
#s/\.location\s*=\s*"$path([^']*)"/.location="$url\/$1"/gi;
#s/window.open\("$path([^"]*)"/window.open\("$url\/$1"/gi;
#s/name=return\s+value="$path([^"]*)"/name=return value="$url\/$1"/gi;
print;
}
}
else {
while($buf = &read_http_connection($con,1024)) {
while(my $buf = &read_http_connection($con,1024)) {
print $buf;
}
}

6
tunnel/login.cgi
View File

@@ -2,9 +2,13 @@
# login.cgi
# Store the username and password for a server in a cookie
use strict;
use warnings;
our (%config, %text, %module_info, %in);
require './tunnel-lib.pl';
&ReadParse();
$enc = &encode_base64($in{'user'}.":".$in{'pass'});
my $enc = &encode_base64($in{'user'}.":".$in{'pass'});
$enc =~ s/\r|\n//g;
print "Set-Cookie: tunnel=$enc; path=/";
if (uc($ENV{'HTTPS'}) eq 'ON') {

3
tunnel/seturl.cgi
View File

@@ -1,6 +1,9 @@
#!/usr/local/bin/perl
# Sets the URL cookie
use strict;
use warnings;
our (%config, %text, %module_info, %in);
require './tunnel-lib.pl';
&ReadParse();
&error_setup($text{'seturl_err'});

6
tunnel/tunnel-lib.pl
View File

@@ -1,13 +1,15 @@
# tunnel-lib.pl
# Common functions for the HTTP-tunnel module
use strict;
use warnings;
BEGIN { push(@INC, ".."); };
use WebminCore;
&init_config();
sub fix_end_url {
my($url) = @_;
if ( $url =~ m/^(http|https):\/\/(\S+)$/ ) {
my ($url) = @_;
if ($url =~ m/^(http|https):\/\/(\S+)$/ ) {
my $schema = $1."://";
my $host = $2;