| 1 |
slords |
1.1 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-manager-1.14.0/root/etc/e-smith/web/common/cgi-bin/login mezzanine_patched_e-smith-manager-1.14.0/root/etc/e-smith/web/common/cgi-bin/login |
| 2 |
|
|
--- e-smith-manager-1.14.0/root/etc/e-smith/web/common/cgi-bin/login 2007-07-01 08:04:55.000000000 -0600 |
| 3 |
|
|
+++ mezzanine_patched_e-smith-manager-1.14.0/root/etc/e-smith/web/common/cgi-bin/login 2007-07-01 08:02:51.000000000 -0600 |
| 4 |
|
|
@@ -83,38 +83,38 @@ |
| 5 |
|
|
my $at = Apache::AuthTkt->new(conf => "/etc/e-smith/web/common/cgi-bin/AuthTKT.cfg"); |
| 6 |
|
|
my $q = CGI->new; |
| 7 |
|
|
my $x_f = $q->http('X-Forwarded-Host'); |
| 8 |
|
|
-warn "X-Forwarded-Host is $x_f\n" if $x_f; |
| 9 |
|
|
-warn "HTTP_HOST is $ENV{HTTP_HOST}\n" if $ENV{HTTP_HOST}; |
| 10 |
|
|
+#warn "X-Forwarded-Host is $x_f\n" if $x_f; |
| 11 |
|
|
+#warn "HTTP_HOST is $ENV{HTTP_HOST}\n" if $ENV{HTTP_HOST}; |
| 12 |
|
|
my ($server_name, $server_port) = split /:/, $q->http('X-Forwarded-Host') || $ENV{HTTP_HOST}; |
| 13 |
|
|
$server_name ||= $ENV{SERVER_NAME} if $ENV{SERVER_NAME}; |
| 14 |
|
|
$server_port ||= $ENV{SERVER_PORT} if $ENV{SERVER_PORT}; |
| 15 |
|
|
#my $AUTH_DOMAIN = $at->domain || $server_name; |
| 16 |
|
|
my $AUTH_DOMAIN = $server_name; |
| 17 |
|
|
-warn "AUTH_DOMAIN is $AUTH_DOMAIN\n"; |
| 18 |
|
|
-warn "AuthTkt->domain was set\n" if $at->domain; |
| 19 |
|
|
+#warn "AUTH_DOMAIN is $AUTH_DOMAIN\n"; |
| 20 |
|
|
+#warn "AuthTkt->domain was set\n" if $at->domain; |
| 21 |
|
|
my @auth_domain = $AUTH_DOMAIN && $AUTH_DOMAIN =~ /\./ ? ( -domain => $AUTH_DOMAIN ) : (); |
| 22 |
|
|
my $ticket = $q->cookie($at->cookie_name); |
| 23 |
|
|
my $probe = $q->cookie('auth_probe'); |
| 24 |
|
|
my $back = $q->cookie($at->back_cookie_name) if $at->back_cookie_name; |
| 25 |
|
|
-warn "back from cookie is $back\n" if $back; |
| 26 |
|
|
+#warn "back from cookie is $back\n" if $back; |
| 27 |
|
|
my $have_cookies = $ticket || $probe || $back || ''; |
| 28 |
|
|
$back ||= $q->param($at->back_arg_name) if $at->back_arg_name; |
| 29 |
|
|
-warn "back from cgi param is $back\n" if $back; |
| 30 |
|
|
+#warn "back from cgi param is $back\n" if $back; |
| 31 |
|
|
$back ||= $ENV{HTTP_REFERER} if $ENV{HTTP_REFERER} && $BACK_REFERER; |
| 32 |
|
|
$back =~ s/^http:/https:/; |
| 33 |
|
|
-warn "back is $back\n"; |
| 34 |
|
|
+#warn "back is $back\n"; |
| 35 |
|
|
if ($back && $back =~ m!^/!) { |
| 36 |
|
|
my $hostname = $server_name; |
| 37 |
|
|
my $port = $server_port; |
| 38 |
|
|
$hostname .= ':' . $port if $port && $port != 80 && $port != 443; |
| 39 |
|
|
$back = sprintf "http%s://%s%s", ($port == 443 ? 's' : ''), $hostname, $back; |
| 40 |
|
|
-warn "back is $back\n"; |
| 41 |
|
|
+#warn "back is $back\n"; |
| 42 |
|
|
} elsif ($back && $back !~ m/^http/i) { |
| 43 |
|
|
$back = 'http://' . $back; |
| 44 |
|
|
-warn "back is $back\n"; |
| 45 |
|
|
+#warn "back is $back\n"; |
| 46 |
|
|
} |
| 47 |
|
|
$back = uri_unescape($back) if $back && $back =~ m/^https?%3A%2F%2F/; |
| 48 |
|
|
-warn "back is $back\n"; |
| 49 |
|
|
+#warn "back is $back\n"; |
| 50 |
|
|
my $back_esc = uri_escape($back) if $back; |
| 51 |
|
|
my $back_html = escapeHTML($back) if $back; |
| 52 |
|
|
|
| 53 |
|
|
@@ -328,7 +328,7 @@ |
| 54 |
|
|
print qq(</form>\n); |
| 55 |
|
|
} |
| 56 |
|
|
|
| 57 |
|
|
- print qq(<p><a href="$back_html">Previous Page</a></p>\n) if $back_html; |
| 58 |
|
|
+# print qq(<p><a href="$back_html">Previous Page</a></p>\n) if $back_html; |
| 59 |
|
|
print <<EOD; |
| 60 |
|
|
</div> |
| 61 |
|
|
</body> |
| 62 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-manager-1.14.0/root/etc/e-smith/web/common/cgi-bin/logout mezzanine_patched_e-smith-manager-1.14.0/root/etc/e-smith/web/common/cgi-bin/logout |
| 63 |
|
|
--- e-smith-manager-1.14.0/root/etc/e-smith/web/common/cgi-bin/logout 2007-07-01 08:04:55.000000000 -0600 |
| 64 |
|
|
+++ mezzanine_patched_e-smith-manager-1.14.0/root/etc/e-smith/web/common/cgi-bin/logout 2007-07-01 08:04:34.000000000 -0600 |
| 65 |
|
|
@@ -33,7 +33,7 @@ |
| 66 |
|
|
my $at = Apache::AuthTkt->new(conf => "/etc/e-smith/web/common/cgi-bin/AuthTKT.cfg"); |
| 67 |
|
|
my $q = CGI->new; |
| 68 |
|
|
my ($server_name, $server_port) = split /:/, $q->http('X-Forwarded-Host') || $ENV{HTTP_HOST}; |
| 69 |
|
|
-warn "servername is $server_name; HOST is $ENV{HTTP_HOST}\n"; |
| 70 |
|
|
+#warn "servername is $server_name; HOST is $ENV{HTTP_HOST}\n"; |
| 71 |
|
|
$server_name ||= $ENV{SERVER_NAME}; |
| 72 |
|
|
$server_port ||= $ENV{SERVER_PORT}; |
| 73 |
|
|
$server_port = '443'; |
Parent Directory
| 
Revision Log
| 
Revision Graph
