Merge git://1.41.41.1/

9 files changed, 176 insertions, 10 deletions

diff --git a/contrib/whoisd/README b/contrib/whoisd/README
new file mode 100644
index 0000000..228197c
--- /dev/null
+++ b/contrib/whoisd/README
@@ -0,0 +1,8 @@
+RTFS
+
+todo:
+  ipv6
+  more info in responses?
+  make it compatible with traceroute -A ?
+
+add any other features you'd like either in here or the source. You know perl, right?
diff --git a/contrib/whoisd/whoisd.pl b/contrib/whoisd/whoisd.pl
new file mode 100755
index 0000000..158c075
--- /dev/null
+++ b/contrib/whoisd/whoisd.pl
@@ -0,0 +1,129 @@
+#!/usr/bin/perl
+# coded by epoch.
+# use inetd or tcpserver or something else.
+# waste of time to do manual sockets for something like this.
+# this isn't my baby. you can murder it if you want.
+
+use strict;
+
+my $RESDB = "/services/resdb/resdb";
+
+my $HACK=0;
+my $QUERY=<stdin>;
+$QUERY =~ s/\r\n//g;
+my $out;
+my $title;
+my $value;
+my @parts;
+my $i;
+
+if($QUERY eq "!!\n") {
+ $QUERY=<stdin>;
+ $QUERY =~ s/^!r(.+?)[\/,].*$/\1/;
+ printf "A500\n"; #fake this I guess. Does it even use that number for anything?
+ printf "%% Looks like you're trying -A on a BSDian traceroute with this server.\n";
+ $HACK=1;
+}
+
+# ASNs
+if($QUERY =~ m/^AS(.+?)$/) {
+ printf "%% AS section for %s\n", $QUERY;
+ my $AS=$1;
+ chdir("$RESDB/db/as") || die "%% error";
+ if(chdir($AS) || die "%% error") {
+  foreach(split(/\n/,`grep '' -r .`)) {
+   $out = $_;
+   $out =~ s/^\.\///g;
+   $out =~ m/^(.+?):(.+?)$/;
+   ($title, $value) = ($1, $2);
+   printf "%-20s %s\n", $title . ":", $value;
+   if($title eq "owner") {
+    $QUERY = $value;
+   }
+  }
+ } else {
+  printf "AS not found.";
+ }
+}
+
+# IPv4 addresses
+if($QUERY =~ m/^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/) {
+ printf "%% IP section for %s\n", $QUERY unless $HACK;
+ chdir("$RESDB/db/ip") || die "%% error";
+ @parts=split(/\./,$QUERY);
+ for($i=0;$i<scalar(@parts)-1;$i++) {
+  if(!chdir(sprintf("%02X",$parts[$i]))) {
+   printf "%-20s %s\n", "error" . ":", "IP not found." unless $HACK;
+   exit;
+  }
+ }
+ foreach(split(/\n/,`grep '' -r .`)) {
+  $out = $_;
+  $out =~ s/^\.\///g;
+  ($title, $value) = split(/:/,$out);
+  printf "%-20s %s\n", $title . ":", $value unless $HACK;
+  if($title eq "owner") {
+   $QUERY = $value;
+  }
+ }
+}
+
+
+# if we get here and there's still a . in the query it is probably a domain.
+if($QUERY =~ m/\./) {
+ printf "%% domain section for %s\n", $QUERY;
+ @parts=split(/\./,$QUERY);
+ chdir("$RESDB/db/dom") || die "%% error";
+ for($i=scalar(@parts)-1;$i>scalar(@parts)-3;$i--) {
+  if(!$parts[$i]) {
+   printf "%% error";
+   exit
+  }
+  if(!chdir($parts[$i])) {
+   printf "%-20s %s", "warning" . ":", "domain not found.";
+   exit;
+  }
+ }
+ foreach(split(/\n/,`grep '' -r .`)) {
+  $out = $_;
+  $out =~ s/^\.\///g;
+  $out =~ m/^(.+?):(.+?)$/;
+  ($title, $value) = ($1, $2);
+  printf "%-20s %s\n", $title . ":", $value;
+  if($title eq "owner") {
+   $QUERY = $value;
+  }
+ }
+}
+
+# default to assuming it is a name.
+printf "%% user section for %s\n", $QUERY unless $HACK;
+
+chdir("$RESDB/db/usr") || die "%% error";
+if(chdir($QUERY)) {
+ foreach(split(/\n/,`grep '' -r .`)) {
+  $out = $_;
+  $out =~ s/^\.\///g;
+  $out =~ m/^(.+?):(.+?)$/;
+  ($title, $value) = ($1, $2);
+  printf "%-20s %s\n", $title . ":", $value unless $HACK;
+ }
+} else {
+ printf "%-20s missing db/usr file.\n", "warning" . ":" unless $HACK;
+}
+chdir("$RESDB/db/as") || die "%% error";
+foreach(split(/\n/,`grep '^$QUERY\$' */owner | cut -d/ -f1`)) {
+ $out = $_;
+ $out =~ s/\n//g;
+ printf "%-20s AS%s\n", "origin" . ":", $out if $HACK;
+ printf "%-20s AS%s\n", "origin" . ":", $out unless $HACK;
+}
+
+foreach(split(/\n/,`grep -i -e "^$QUERY\$" "$RESDB/db/dom"/*/*/owner`)) {
+ $out = $_;
+ $out =~ s/.*\/db\/dom\/(.+?)\/(.+?)\/owner.*/\2\.\1/;
+ if ($out ne "") { #fix this comparison.
+  printf "%-20s %s\n", "domain" . ":", $out;
+ }
+}
+#printf "%-20s %s\n", "notice:","$QUERY did not claim any domains yet";
diff --git a/db/dom/ano/allowed/ns/ns6.allowed.ano b/db/dom/ano/allowed/ns/ns6.allowed.ano
new file mode 100644
index 0000000..542e31a
--- /dev/null
+++ b/db/dom/ano/allowed/ns/ns6.allowed.ano
@@ -0,0 +1 @@
+fd63:1e39:6f73:2929::1
diff --git a/db/dom/ano/whois/ns/ns.whois.ano b/db/dom/ano/whois/ns/ns.whois.ano
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/db/dom/ano/whois/ns/ns.whois.ano
diff --git a/db/dom/ano/whois/owner b/db/dom/ano/whois/owner
new file mode 100644
index 0000000..3aea3d0
--- /dev/null
+++ b/db/dom/ano/whois/owner
@@ -0,0 +1 @@
+epoch
diff --git a/db/usr/epoch/email b/db/usr/epoch/email
new file mode 100644
index 0000000..bbaa967
--- /dev/null
+++ b/db/usr/epoch/email
@@ -0,0 +1 @@
+epoch@hacking.allowed.ano
diff --git a/db/usr/epoch/irc b/db/usr/epoch/irc
new file mode 100644
index 0000000..e6402a5
--- /dev/null
+++ b/db/usr/epoch/irc
@@ -0,0 +1 @@
+epoch in #default on hacking.allowed.ano
diff --git a/scripts/nameserver_autogen/bind_tld_zonefile b/scripts/nameserver_autogen/bind_tld_zonefile
index 344bb4e..fb224e5 100755
--- a/scripts/nameserver_autogen/bind_tld_zonefile
+++ b/scripts/nameserver_autogen/bind_tld_zonefile
@@ -1,4 +1,5 @@
 #!/usr/bin/php
+#does anyone use this?
 <?php
 print('$ttl 600'."\n");
 chdir('../db/dom/ano');
diff --git a/scripts/nameserver_autogen/bind_tld_zonefile.sh b/scripts/nameserver_autogen/bind_tld_zonefile.sh
index 72c1128..06eb802 100755
--- a/scripts/nameserver_autogen/bind_tld_zonefile.sh
+++ b/scripts/nameserver_autogen/bind_tld_zonefile.sh
@@ -3,33 +3,57 @@
 #be sure to edit these variables first.
 
 ANO_ZONEFILE=/etc/namedb/ano
+RDNS_ZONEFILE=/etc/namedb/1.in-addr.arpa
 RESDB_PATH=/services/resdb/resdb
 
-echo "; this zonefile genreated on: `date`" > $ANO_ZONEFILE
-echo '$TTL 3600' >> $ANO_ZONEFILE
-echo '@ IN SOA localns root ('`date +" %Y%m%d00"`' 60 300 3600000 3600 )' >> $ANO_ZONEFILE
-echo '@ IN NS localns' >> $ANO_ZONEFILE
-echo 'localns IN A 127.0.0.1' >> $ANO_ZONEFILE
 
 cd ${RESDB_PATH}/db/dom/ano
 
-echo -n generating zonefile... 
+echo -n "generating ipv4 reverse lookup zonefile for 1/8..."
+
+echo "; this zonefile genreated on: `date`" > "$RDNS_ZONEFILE"
+echo '$TTL 3600' >> "$RDNS_ZONEFILE"
+echo '@ IN SOA localhost. root.localhost. ('`date +" %Y%m%d%H"`' 60 300 3600000 3600 )' >> "$RDNS_ZONEFILE"
+echo '@ IN NS localhost.' >> "$RDNS_ZONEFILE"
+echo 'localhost. IN A 127.0.0.1' >> "$RDNS_ZONEFILE"
+
+for i in `ls /services/resdb/resdb/db/ip/01/*/*/ns/*`;do
+ f=$(basename $i)
+ a=$(basename $(dirname $i))
+ b=$(basename $(dirname $(dirname $i)))
+ c=$(basename $(dirname $(dirname $(dirname $i))))
+ printf "%d.%d IN NS %s\n" $[0x${b}] $[0x${c}] ${f}.
+done >> "$RDNS_ZONEFILE"
+echo done.
+
+echo -n generating .ano TLD zonefile... 
+
+echo "; this zonefile genreated on: `date`" > "$ANO_ZONEFILE"
+echo '$TTL 3600' >> "$ANO_ZONEFILE"
+echo '@ IN SOA localhost. root.localhost. ('`date +" %Y%m%d%H"`' 60 300 3600000 3600 )' >> "$ANO_ZONEFILE"
+echo '@ IN NS localhost.' >> "$ANO_ZONEFILE"
+echo 'localhost. IN A 127.0.0.1' >> "$ANO_ZONEFILE"
+
 for name in *;do
  if [ -e "${name}/ns/" ];then
   for server in "$name"/ns/*;do
-   if grep '\.ano$' <<< $name > /dev/null;then
+   if grep '\.ano$' <<< "$name" > /dev/null;then
     true
    fi
-   if grep '\.ano$' <<< $server > /dev/null;then
+   if grep '\.ano$' <<< "$server" > /dev/null;then
     true
    fi
    fqserver=`cut -d/ -f3- <<< $server`
    echo -e "${name}\tIN NS\t${fqserver}."
    for ip in `cat ${server}`;do 
-    echo -e "${fqserver}.\tIN A\t$ip"
+    if grep ':' <<< "$ip" > /dev/null;then
+     echo -e "${fqserver}.\tIN AAAA\t$ip"
+    else
+     echo -e "${fqserver}.\tIN A\t$ip"
+    fi
    done
   done
  fi
-done >> $ANO_ZONEFILE
+done >> "$ANO_ZONEFILE"
 echo done.
 echo might want to send a sighup to your named now.