Changeset 190

Timestamp:

12/08/11 18:12:01 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Start passing user data into DNSDB.pm subs for logging internal
to DNSDB.pm
addDomain() hacked up - may be useful to only pass UID and retrieve
that on log insert in _log() later instead of passing username
and fullname from UI

Location:

trunk

Files:

• DNSDB.pm (modified) (6 diffs)
• dns.cgi (modified) (2 diffs)

trunk/DNSDB.pm

@@ -487 +487 @@
 # Log an action
 # Internal sub
-# Takes a database handle, <foo>, <bar>
+# Takes a database handle, domain_id, user_id, group_id, email, name and log entry
 sub _log {
+  my $dbh = shift;
+  my ($domain_id,$user_id,$group_id,$username,$name,$entry) = @_;
+
+##fixme:  farm out the actual logging to different subs for file, syslog, internal, etc based on config
+  $dbh->do("INSERT INTO log (domain_id,user_id,group_id,email,name,entry) VALUES (?,?,?,?,?,?)", undef,
+        ($domain_id,$user_id,$group_id,$username,$name,$entry));
+#            123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890
+#                     1         2         3         4         5         6         7
 } # end _log
 
@@ -498 +506 @@
 ## DNSDB::addDomain()
 # Add a domain
-# Takes a database handle, domain name, numeric group, and boolean(ish) state (active/inactive)
+# Takes a database handle, domain name, numeric group, boolean(ish) state (active/inactive),
+# and user info hash (for logging).
 # Returns a status code and message
 sub addDomain {
@@ -511 +520 @@
   return ('FAIL',"Need domain status") if !defined($state);
 
+  my %userinfo = @_;    # remaining bits.
+# user ID, username, user full name
+
   $state = 1 if $state =~ /^active$/;
   $state = 1 if $state =~ /^on$/;
@@ -518 +530 @@
   return ('FAIL',"Invalid domain status") if $state !~ /^\d+$/;
 
+  return ('FAIL', "Invalid characters in domain") if $domain !~ /^[a-zA-Z0-9_.-]+$/;
+
   my $sth = $dbh->prepare("SELECT domain_id FROM domains WHERE domain=?");
   my $dom_id;
@@ -532 +546 @@
   local $dbh->{RaiseError} = 1;
 
+my $stage = 'insert';
   # Wrap all the SQL in a transaction
   eval {
     # insert the domain...
-    my $sth = $dbh->prepare("insert into domains (domain,group_id,status) values (?,?,?)");
-    $sth->execute($domain,$group,$state);
+    $dbh->do("INSERT INTO domains (domain,group_id,status) VALUES (?,?,?)", undef, ($domain, $group, $state));
+$stage = 'domid';
 
     # get the ID...
-    $sth = $dbh->prepare("select domain_id from domains where domain='$domain'");
-    $sth->execute;
-    ($dom_id) = $sth->fetchrow_array();
-
+    ($dom_id) = $dbh->selectrow_array("SELECT domain_id FROM domains WHERE domain=?", undef, ($domain));
+
+$stage = 'loginsert';
+    _log($dbh, $dom_id, $userinfo{id}, $group, $userinfo{name}, $userinfo{fullname},
+        "Added ".($state ? 'active' : 'inactive')." domain $domain");
+
+$stage = 'getdefrec';
     # ... and now we construct the standard records from the default set.  NB:  group should be variable.
-    $sth = $dbh->prepare("select host,type,val,distance,weight,port,ttl from default_records where group_id=$group");
-    my $sth_in = $dbh->prepare("insert into records (domain_id,host,type,val,distance,weight,port,ttl)".
-        " values ($dom_id,?,?,?,?,?,?,?)");
-    $sth->execute;
+    my $sth = $dbh->prepare("SELECT host,type,val,distance,weight,port,ttl FROM default_records WHERE group_id=?");
+    my $sth_in = $dbh->prepare("INSERT INTO records (domain_id,host,type,val,distance,weight,port,ttl)".
+        " VALUES ($dom_id,?,?,?,?,?,?,?)");
+    $sth->execute($group);
     while (my ($host,$type,$val,$dist,$weight,$port,$ttl) = $sth->fetchrow_array()) {
       $host =~ s/DOMAIN/$domain/g;
       $val =~ s/DOMAIN/$domain/g;
       $sth_in->execute($host,$type,$val,$dist,$weight,$port,$ttl);
+      if ($typemap{$type} eq 'SOA') {
+        my @tmp1 = split /:/, $host;
+        my @tmp2 = split /:/, $val;
+        _log($dbh, $dom_id, $userinfo{id}, $group, $userinfo{name}, $userinfo{fullname},
+                "[new $domain] Added SOA record [contact $tmp1[0]] [master $tmp1[1]] ".
+                "[refresh $tmp2[0]] [retry $tmp2[1]] [expire $tmp2[2]] [minttl $tmp2[3]], TTL $ttl");
+      } else {
+        my $logentry = "[new $domain] Added record '$host $typemap{$type}";
+        $logentry .= " [distance $dist]" if $typemap{$type} eq 'MX';
+        $logentry .= " [priority $dist] [weight $weight] [port $port]" if $typemap{$type} eq 'SRV';
+        _log($dbh, $dom_id, $userinfo{id}, $group, $userinfo{name}, $userinfo{fullname},
+                $logentry." $val', TTL $ttl");
+      }
     }
 
@@ -561 +592 @@
     my $msg = $@;
     eval { $dbh->rollback; };
-    return ('FAIL',$msg);
+    return ('FAIL',"$msg : $stage");
   } else {
     return ('OK',$dom_id);

trunk/dns.cgi

@@ -343 +343 @@
   }
 
-  my ($code,$msg) = addDomain($dbh,$webvar{domain},$webvar{group},($webvar{makeactive} eq 'on' ? 1 : 0));
+  my ($code,$msg) = addDomain($dbh,$webvar{domain},$webvar{group},($webvar{makeactive} eq 'on' ? 1 : 0),
+        (name => $session->param("username"), id => $session->param("uid")));
 
   if ($code eq 'OK') {
@@ -352 +353 @@
     $session->param('add_failed', 1);
 ##fixme:  domain a security risk for XSS?
+##fixme:  keep active/inactive state, group selection
     changepage(page => "newdomain", domain => $webvar{domain}, errmsg => $msg);
   }