From 46c4184bc54fa4783037e252d5fa5513528cf03c Mon Sep 17 00:00:00 2001
From: b <b@05ce6ebb-7522-4a6e-a768-0026ae12be9f>
Date: Tue, 1 Dec 2015 23:40:42 +0000
Subject: [PATCH] proxy: (de)compression. library: cnofig file reading html
entity decoding
git-svn-id: svn://botcastle1b/yplom/proxy@12 05ce6ebb-7522-4a6e-a768-0026ae12be9f
---
cleararch.1.pl | 4 +-
proxy.1.pl | 4 +-
proxy_lib.1.pm | 302 ++++++++++++++++++++++++++++++++++++++++++++++++-
3 files changed, 304 insertions(+), 6 deletions(-)
diff --git a/cleararch.1.pl b/cleararch.1.pl
index 63c1b5f..25dae8c 100644
--- a/cleararch.1.pl
+++ b/cleararch.1.pl
@@ -11,7 +11,7 @@ use POSIX qw(strftime);
###TIMEOUT_ARCH;
$time = time();
-print strftime("%d.%m.%Y %H:%M:%S", gmtime($time))."\n";
+print strftime('%d.%m.%Y %H:%M:%S', gmtime($time))."\n";
cleardir(ARCH_PATH);
sub cleardir {
@@ -25,7 +25,7 @@ sub cleardir {
print "Failed to open: $dirpath\/\n";
return 0;
}
- while ($subpath = readdir $dir) {
+ while (defined($subpath = readdir $dir)) {
$subpathfull=$dirpath.$subpath;
if ($subpath =~ /^\.\.?$/) {
next;
diff --git a/proxy.1.pl b/proxy.1.pl
index 0de727f..af0b02c 100755
--- a/proxy.1.pl
+++ b/proxy.1.pl
@@ -118,7 +118,7 @@ sub proxy {
my $contentlength;
- my @curl_arg=(CURL_PATH,'-i','-#'); # the command line arguments for curl
+ my @curl_arg=(CURL_PATH,'-i','-#','--compressed'); # the command line arguments for curl
my @reqhead; # the HTTP request header
my @resphead;
@@ -625,7 +625,7 @@ sub unlock {
# All unlocking access must be logged: time, IP, user. The server owner must
# be able to know who did what with the proxy (in case of legal problems).
open ($logfile, ">>", UNLOCK_LOG) or return unlockpage("Couldn't log your action.","Status: 500 Internal Server Error\n");
- print $logfile strftime("%d.%m.%Y %H:%M:%S", gmtime($accesstime))." $IP $CGI{'username'}\n";
+ print $logfile strftime('%d.%m.%Y %H:%M:%S', gmtime($accesstime))." $IP $CGI{'username'}\n";
close($logfile);
# Ok, unlocked. Create access file.
diff --git a/proxy_lib.1.pm b/proxy_lib.1.pm
index f3bf29a..82fc153 100644
--- a/proxy_lib.1.pm
+++ b/proxy_lib.1.pm
@@ -10,16 +10,271 @@ use strict;
use Exporter;
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
+use constant entitycode => {
+ 'amp' => '&',
+ 'gt' => '>',
+ 'lt' => '<',
+ 'quot' => '"',
+ 'acute' => '´',
+ 'cedil' => '¸',
+ 'circ' => 'Ë',
+ 'macr' => '¯',
+ 'middot' => '·',
+ 'tilde' => 'Ë',
+ 'uml' => '¨',
+ 'Aacute' => 'Ã',
+ 'aacute' => 'á',
+ 'Acirc' => 'Ã',
+ 'acirc' => 'â',
+ 'AElig' => 'Ã',
+ 'aelig' => 'æ',
+ 'Agrave' => 'Ã',
+ 'agrave' => 'Ã ',
+ 'Aring' => 'Ã
',
+ 'aring' => 'Ã¥',
+ 'Atilde' => 'Ã',
+ 'atilde' => 'ã',
+ 'Auml' => 'Ã',
+ 'auml' => 'ä',
+ 'Ccedil' => 'Ã',
+ 'ccedil' => 'ç',
+ 'Eacute' => 'Ã',
+ 'eacute' => 'é',
+ 'Ecirc' => 'Ã',
+ 'ecirc' => 'ê',
+ 'Egrave' => 'Ã',
+ 'egrave' => 'è',
+ 'ETH' => 'Ã',
+ 'eth' => 'ð',
+ 'Euml' => 'Ã',
+ 'euml' => 'ë',
+ 'Iacute' => 'Ã',
+ 'iacute' => 'Ã',
+ 'Icirc' => 'Ã',
+ 'icirc' => 'î',
+ 'Igrave' => 'Ã',
+ 'igrave' => 'ì',
+ 'Iuml' => 'Ã',
+ 'iuml' => 'ï',
+ 'Ntilde' => 'Ã',
+ 'ntilde' => 'ñ',
+ 'Oacute' => 'Ã',
+ 'oacute' => 'ó',
+ 'Ocirc' => 'Ã',
+ 'ocirc' => 'ô',
+ 'OElig' => 'Å',
+ 'oelig' => 'Å',
+ 'Ograve' => 'Ã',
+ 'ograve' => 'ò',
+ 'Oslash' => 'Ã',
+ 'oslash' => 'ø',
+ 'Otilde' => 'Ã',
+ 'otilde' => 'õ',
+ 'Ouml' => 'Ã',
+ 'ouml' => 'ö',
+ 'Scaron' => 'Å ',
+ 'scaron' => 'Å¡',
+ 'szlig' => 'Ã',
+ 'THORN' => 'Ã',
+ 'thorn' => 'þ',
+ 'Uacute' => 'Ã',
+ 'uacute' => 'ú',
+ 'Ucirc' => 'Ã',
+ 'ucirc' => 'û',
+ 'Ugrave' => 'Ã',
+ 'ugrave' => 'ù',
+ 'Uuml' => 'Ã',
+ 'uuml' => 'ü',
+ 'Yacute' => 'Ã',
+ 'yacute' => 'ý',
+ 'yuml' => 'ÿ',
+ 'Yuml' => 'Ÿ',
+ 'cent' => '¢',
+ 'curren' => '¤',
+ 'euro' => 'â¬',
+ 'pound' => '£',
+ 'yen' => 'Â¥',
+ 'brvbar' => '¦',
+ 'bull' => 'â¢',
+ 'copy' => '©',
+ 'dagger' => 'â ',
+ 'Dagger' => 'â¡',
+ 'frasl' => 'â',
+ 'hellip' => 'â¦',
+ 'iexcl' => '¡',
+ 'image' => 'â',
+ 'iquest' => '¿',
+ 'lrm' => 'â',
+ 'mdash' => 'â',
+ 'ndash' => 'â',
+ 'not' => '¬',
+ 'oline' => 'â¾',
+ 'ordf' => 'ª',
+ 'ordm' => 'º',
+ 'para' => '¶',
+ 'permil' => 'â°',
+ 'prime' => 'â²',
+ 'Prime' => 'â³',
+ 'real' => 'â',
+ 'reg' => '®',
+ 'rlm' => 'â',
+ 'sect' => '§',
+ 'shy' => 'Â',
+ 'sup1' => '¹',
+ 'trade' => 'â¢',
+ 'weierp' => 'â',
+ 'bdquo' => 'â',
+ 'laquo' => '«',
+ 'ldquo' => 'â',
+ 'lsaquo' => 'â¹',
+ 'lsquo' => 'â',
+ 'raquo' => '»',
+ 'rdquo' => 'â',
+ 'rsaquo' => 'âº',
+ 'rsquo' => 'â',
+ 'sbquo' => 'â',
+ 'emsp' => 'â',
+ 'ensp' => 'â',
+ 'nbsp' => ' ',
+ 'thinsp' => 'â',
+ 'zwj' => 'â',
+ 'zwnj' => 'â',
+ 'deg' => '°',
+ 'divide' => '÷',
+ 'frac12' => '½',
+ 'frac14' => '¼',
+ 'frac34' => '¾',
+ 'ge' => 'â¥',
+ 'le' => 'â¤',
+ 'minus' => 'â',
+ 'sup2' => '²',
+ 'sup3' => '³',
+ 'times' => 'Ã',
+ 'alefsym' => 'âµ',
+ 'and' => 'â§',
+ 'ang' => 'â ',
+ 'asymp' => 'â',
+ 'cap' => 'â©',
+ 'cong' => 'â
',
+ 'cup' => 'âª',
+ 'empty' => 'â
',
+ 'equiv' => 'â¡',
+ 'exist' => 'â',
+ 'fnof' => 'Æ',
+ 'forall' => 'â',
+ 'infin' => 'â',
+ 'int' => 'â«',
+ 'isin' => 'â',
+ 'lang' => 'â¨',
+ 'lceil' => 'â',
+ 'lfloor' => 'â',
+ 'lowast' => 'â',
+ 'micro' => 'µ',
+ 'nabla' => 'â',
+ 'ne' => 'â ',
+ 'ni' => 'â',
+ 'notin' => 'â',
+ 'nsub' => 'â',
+ 'oplus' => 'â',
+ 'or' => 'â¨',
+ 'otimes' => 'â',
+ 'part' => 'â',
+ 'perp' => 'â¥',
+ 'plusmn' => '±',
+ 'prod' => 'â',
+ 'prop' => 'â',
+ 'radic' => 'â',
+ 'rang' => 'â©',
+ 'rceil' => 'â',
+ 'rfloor' => 'â',
+ 'sdot' => 'â
',
+ 'sim' => 'â¼',
+ 'sub' => 'â',
+ 'sube' => 'â',
+ 'sum' => 'â',
+ 'sup' => 'â',
+ 'supe' => 'â',
+ 'there4' => 'â´',
+ 'Alpha' => 'Î',
+ 'alpha' => 'α',
+ 'Beta' => 'Î',
+ 'beta' => 'β',
+ 'Chi' => 'Χ',
+ 'chi' => 'Ï',
+ 'Delta' => 'Î',
+ 'delta' => 'δ',
+ 'Epsilon' => 'Î',
+ 'epsilon' => 'ε',
+ 'Eta' => 'Î',
+ 'eta' => 'η',
+ 'Gamma' => 'Î',
+ 'gamma' => 'γ',
+ 'Iota' => 'Î',
+ 'iota' => 'ι',
+ 'Kappa' => 'Î',
+ 'kappa' => 'κ',
+ 'Lambda' => 'Î',
+ 'lambda' => 'λ',
+ 'Mu' => 'Î',
+ 'mu' => 'μ',
+ 'Nu' => 'Î',
+ 'nu' => 'ν',
+ 'Omega' => 'Ω',
+ 'omega' => 'Ï',
+ 'Omicron' => 'Î',
+ 'omicron' => 'ο',
+ 'Phi' => 'Φ',
+ 'phi' => 'Ï',
+ 'Pi' => 'Î ',
+ 'pi' => 'Ï',
+ 'piv' => 'Ï',
+ 'Psi' => 'Ψ',
+ 'psi' => 'Ï',
+ 'Rho' => 'Ρ',
+ 'rho' => 'Ï',
+ 'Sigma' => 'Σ',
+ 'sigma' => 'Ï',
+ 'sigmaf' => 'Ï',
+ 'Tau' => 'Τ',
+ 'tau' => 'Ï',
+ 'Theta' => 'Î',
+ 'theta' => 'θ',
+ 'thetasym' => 'Ï',
+ 'upsih' => 'Ï',
+ 'Upsilon' => 'Î¥',
+ 'upsilon' => 'Ï
',
+ 'Xi' => 'Î',
+ 'xi' => 'ξ',
+ 'Zeta' => 'Î',
+ 'zeta' => 'ζ',
+ 'crarr' => 'âµ',
+ 'darr' => 'â',
+ 'dArr' => 'â',
+ 'harr' => 'â',
+ 'hArr' => 'â',
+ 'larr' => 'â',
+ 'lArr' => 'â',
+ 'rarr' => 'â',
+ 'rArr' => 'â',
+ 'uarr' => 'â',
+ 'uArr' => 'â',
+ 'clubs' => 'â£',
+ 'diams' => 'â¦',
+ 'hearts' => 'â¥',
+ 'spades' => 'â ',
+ 'loz' => 'â',
+};
+
###ARCH_PATH;
###ACCESS_PATH;
###TIMEOUT_UNLOCK;
###TIMEOUT_INACT;
###UNLOCK_PROXY_HOST;
-$VERSION = 0.000002;
+$VERSION = 0.000003;
@ISA = qw(Exporter);
@EXPORT = ();
-@EXPORT_OK = qw(access divideurl formatheader getcgi joinurl path2url url2path path2urldiv urldecode urldiv2path);
+@EXPORT_OK = qw(access divideurl entitydecode formatheader getcgi joinurl path2url url2path path2urldiv readconfigfile urldecode urldiv2path);
%EXPORT_TAGS = ();
# This function checks if the user has unlocked the proxy. Nonzero means yes.
@@ -192,6 +447,28 @@ sub urldecode {
return $t;
}
+sub entitydecode {
+ my $t = $_[0];
+ $t =~ s/&(#?[a-zA-Z0-9]+);/entitydecode1ch($1)/eg;
+ return $t;
+}
+
+sub entitydecode1ch {
+ my $t = $_[0];
+ if ($t =~ /^#([0-9]+)$/) {
+ return chr($1);
+ }
+ elsif ($t =~ /^#x([0-9A-Fa-f]+)$/) {
+ return chr(hex($1));
+ }
+ elsif ($t =~ /^([A-Za-z0-9]+)$/) {
+ return entitycode->{$1};
+ }
+ else {
+ return '';
+ }
+}
+
# The function to get CGI parameters from string.
# Format is: name=url_encoded_value&name=url_encoded_value& ... &name=url_encoded_value
sub getcgi {
@@ -534,4 +811,25 @@ sub path2url {
return joinurl(path2urldiv($_[0]));
}
+sub readconfigfile {
+ (my $configpath) = @_;
+ my $configfile;
+ my %config;
+
+ if (open ($configfile, "<", $configpath)) {
+ while (defined(my $line = <$configfile>)) {
+ $line =~ s/[\r\n]//g;
+ $line =~ s/#.*$//;
+ if ($line =~ /^ *([a-zA-Z0-9_\-\.]+) *= *(.*)$/){
+ my $name=$1;
+ my $value=$2;
+ $value =~ s/ *$//;
+ $config{$name}=$value;
+ }
+ }
+ close ($configfile);
+ }
+ return %config;
+}
+
1;
--
2.30.2