Changeset 62 for trunk

Timestamp:

02/12/16 15:45:59 (8 years ago)

Author:

Kris Deugau

Message:

/trunk/uribl

Commit accumulated tweaks and fixes from production:

• add "use Encode;" and set the HTTP charset header to deal with non-ASCII more sanely
• reorder mangling of request-URI components a little so we can symlink index.cgi -> uridb.cgi
• collapse results from extract-data showing a hit on some other DNSBL into a single field rather than just treating it as "another domain" that needs to be hand-reflagged as "don't list"
• use POST for form submissions; mainly to clean up the working URL

Location:

trunk/uribl

Files:

• Makefile (modified) (2 diffs)
• templates/index.tmpl (modified) (1 diff)
• templates/report.tmpl (modified) (1 diff)
• uridb.cgi (modified) (5 diffs)

trunk/uribl/Makefile

@@ -7 +7 @@
 
 PKGNAME=uridb
-VERSION=0.1
+VERSION=0.1.2
 
 # bloody stupid Debian config puts OS-provided packaged sitelib under
@@ -29 +29 @@
         rm -rf $(PKGNAME)-$(VERSION)
         # gpg --detach-sign $(PKGNAME)-$(VERSION).tar.gz
-

trunk/uribl/templates/index.tmpl

@@ -6 +6 @@
 <TMPL_VAR NAME=pgcomment>
 <!-- <TMPL_VAR NAME=uridbsiteroot> -->
-<form action="<TMPL_VAR NAME=cgiself>">
+<form action="<TMPL_VAR NAME=cgiself>" method="POST">
 <input type=hidden name=page value=report>
 <table>

trunk/uribl/templates/report.tmpl

@@ -7 +7 @@
 <TMPL_VAR NAME=pgcomment><br>
 <a href="<TMPL_VAR NAME=uridbsiteroot>">Back</a>
-<form action="<TMPL_VAR NAME=cgiself>">
+<form action="<TMPL_VAR NAME=cgiself>" method="POST">
 <input type=hidden name=page value="dbreport">
 <table border=1>
-<tr><td>&nbsp;</td><td colspan=4 align=center>List as:</td></tr>
-<tr><td>Domain</td><td>Don't list</td><td>Black</td><td>Grey</td><td>URL shortener</td><td>Comment</td></tr>
+<tr><td colspan=2>&nbsp;</td><td colspan=4 align=center>List as:</td></tr>
+<tr><td>Domain</td><td>Other lists</td><td>Don't list</td><td>Black</td><td>Grey</td><td>URL shortener</td><td>Comment</td></tr>
 <TMPL_LOOP NAME=domlist>
 <tr>
 <td><TMPL_VAR NAME=domain><input type=hidden name=dom<TMPL_VAR NAME=domindex> value="<TMPL_VAR NAME=domain>"></td>
+<td><TMPL_VAR NAME=otherlists></td>
 <td align="center"><input type=radio name=dom<TMPL_VAR NAME=domindex>type value="0"></td>
 <td align="center"><input type=radio name=dom<TMPL_VAR NAME=domindex>type value="2" checked></td>

trunk/uribl/uridb.cgi

@@ -25 +25 @@
 use CGI::Simple;
 use HTML::Template;
+use Encode;
+
 use URIdb;
 
@@ -40 +42 @@
 my $uridb = new URIdb;
 
-print "Content-type: text/html\n\n";
+print $q->header(-charset=>'utf8');
 
 # default DB info - all other settings should be loaded from the DB.
@@ -71 +73 @@
 
 my $page;
-my $templatedir = $ENV{SCRIPT_FILENAME};
-$templatedir =~ s/uridb\.cgi//;
-$templatedir .= "templates";
-$ENV{HTML_TEMPLATE_ROOT} = $templatedir;
 
 my $cgiself = $ENV{SCRIPT_FILENAME};
 $cgiself =~ s|.+/([^/]+\.cgi)$|$1|;
+
+my $templatedir = $ENV{SCRIPT_FILENAME};
+$templatedir =~ s/$cgiself//;
+$templatedir .= "templates";
+$ENV{HTML_TEMPLATE_ROOT} = $templatedir;
 
 my %config;
@@ -98 +101 @@
 
 my $uridbsiteroot = $ENV{REQUEST_URI};
-$uridbsiteroot =~ s|/uridb\.cgi\?.+|/|;
+$uridbsiteroot =~ s|/$cgiself\?.+|/|;
 $page->param(uridbsiteroot => $uridbsiteroot);
 
@@ -108 +111 @@
   foreach my $domain (@dombase) {
     my %row;
-    $row{domindex} = $domcount++;
     ($domain) = split /:/, $domain;
     $domain =~ s/^\+//;
     $domain =~ s/\.uribl.company.com//;
     chomp $domain;
+    # now, see if it's multilisted
+    if ($domain =~ / on (\w+)\s*$/) {
+      my $sub = $1;
+      #$domain =~ s/ on \w+\s*$//;
+      $domlist[$domcount-1]->{otherlists} .= ",$sub";
+      next;
+    }
+    $row{domindex} = $domcount++;
     $row{domain} = $domain;
     push @domlist, \%row;
   }
+
   $page->param(domlist => \@domlist);