Changeset 401 for trunk/DNSDB.pm

Timestamp:

10/03/12 18:17:51 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Begin updating dns-rpc.cgi. See #43.

Add initRPC() in DNSDB.pm. This sets up the userdata needed
for logging. Prevent the pseudousers added in initRPC() from
being displayed in the user management UI. Sooner or later
this will need to be cleaned up so stale users can be deleted.
Closes #33.

Bring a bit more consistency to error messages, and eliminate
references to odd depths of the code, by adding "\n" to the end
of a few lurking die strings in DNSDB.pm, and all method-sub ones
in dns-rpc.cgi.

Clean up a handful of gross syntax and scope errors from copy-paste
work apparently never checked.

Call new loadConfig() and initRPC() on startup. Add a utility sub
to call from the method subs to check the RPC caller+IP pair against
the new config option.

Update call for delDomain to delZone. Update call to getDomRecs()
to match normalized hash-argument form from r397.

File:

• trunk/DNSDB.pm (modified) (4 diffs)

trunk/DNSDB.pm

@@ -1407 +1407 @@
 
 
+## DNSDB::initRPC()
+# Takes a database handle, remote username, and remote fullname.
+# Sets up the RPC logging-pseudouser if needed.
+# Sets the %userdata hash for logging.
+# Returns undef on failure
+sub initRPC {
+  my $dbh = shift;
+  my %args  = @_;
+
+  return if !$args{username};
+  return if !$args{fullname};
+
+  %userdata = %{$dbh->selectrow_hashref("SELECT user_id,group_id,firstname,lastname,status FROM users".
+        " WHERE username=?", undef, ($args{username}) )};
+  if (!%userdata) {
+    $dbh->do("INSERT INTO users (username,password,firstname,type) VALUES (?,'RPC',?,'R')", undef,
+        ($args{username}, $args{fullname}) );
+    %userdata = %{$dbh->selectrow_hashref("SELECT user_id,group_id,firstname,lastname,status FROM users".
+        " WHERE username=?", undef, ($args{username}) )};
+  }
+  $userdata{fullname} = "$userdata{firstname} $userdata{lastname}/$args{rpcsys}";
+  return 1 if %userdata;
+} # end initRPC()
+
+
 ## DNSDB::login()
 # Takes a database handle, username and password
@@ -2585 +2610 @@
 
 # Permissions!  Gotta set'em all!
-    die "Invalid permission string $permstring"
+    die "Invalid permission string $permstring\n"
         if $permstring !~ /^(?:
                 i       # inherit
@@ -2703 +2728 @@
         ($args{startwith} ? " AND u.username ~* ?" : '').
         ($args{filter} ? " AND u.username ~* ?" : '').
+        " AND NOT u.type = 'R' ".
         " ORDER BY $args{sortby} $args{sortorder} ".
         ($args{offset} eq 'all' ? '' : " LIMIT $config{perpage} OFFSET ".$args{offset}*$config{perpage});
@@ -4225 +4251 @@
           # revzones have records more or less reversed from forward zones.
           my ($tmpcode,$tmpmsg) = _zone2cidr($host);
-          die "Error converting NS record: $tmpmsg" if $tmpcode eq 'FAIL';      # hmm.  may not make sense...
+          die "Error converting NS record: $tmpmsg\n" if $tmpcode eq 'FAIL';    # hmm.  may not make sense...
           $val = "$tmpmsg";
           $host = $rr->nsdname;