dns_one 0.4.31 → 0.4.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86b8305fbb1e6d4c2eec401c5b67ace08e282c2b
-  data.tar.gz: 4cf1e386c035351ba310619da3221df4ba7bd212
+  metadata.gz: 900d8755b12840905147de4a017db2cc231029a2
+  data.tar.gz: 98d9df6846a22c4a25b0c251c81dfed25bc9c222
 SHA512:
-  metadata.gz: 536fb7c338ac4ea364a86601c5c9292e20150306b733b7d7992172a252b5cd84079828d42c755a420fa724cdf22249f7465df1eb73923ed14803feddeec6dce3
-  data.tar.gz: 8c15909797901a1ac9e88482faeca08e70d6d57ea25334d07aaab878011f0bf0776f207492a310927886c229bb57212facfcb2294ac521b1c7cbf1955ea35cfb
+  metadata.gz: 38d134a6dc61b371657dec056001fd0858585da70b83a6e5b8c63c2aa28e870f9bda1468663852ea3aa4c3ae82111e5f35b081c7f3379e654d91892b63f36a75
+  data.tar.gz: 189ff251f98d724fd94416e12ef87f74156af648644a275336f6f1fd2e84b44a78f605f6b1b9986a1764d65cc6e4306f7f940d041d18e023f59c7f75e7fe177c

data/lib/dns_one/server.rb

@@ -15,22 +15,24 @@ module DnsOne; class Server
     def initialize conf, conf_zone_search
         @conf = conf
         @zone_search = ZoneSearch.instance.setup conf_zone_search
-        @stat = Stat.new
     end
 
     def run
         zone_search = @zone_search
         conf = @conf
-        stat = @stat
+        stat = nil
 
         RubyDNS::run_server(listen: dns_daemon_interfaces, logger: Log.logger) do
             on(:start) do
                 if RExec.current_user == 'root'
                     run_as = conf[:run_as] || DEFAULT_RUN_AS
+        	    stat = Stat.new user: run_as if !stat
                     RExec.change_user run_as
+		    user = run_as
+	        else
+        	    stat = Stat.new if !stat
                 end
                 Log.i "Running as #{RExec.current_user}"
-                File.chown DnsOne::DnsOne::STAT_DB, RExec.current_user
             end
 
             match(/(.+)/) do |t| # transaction

data/lib/dns_one/setup.rb

@@ -63,8 +63,10 @@ module DnsOne; class Setup
 
     def mkdirs
         FileUtils.mkdir_p DnsOne::CONF_DIR
+
         FileUtils.mkdir_p DnsOne::WORK_DIR
         File.chmod 0755, DnsOne::WORK_DIR
+        File.chmod `id -u #{Server::DEFAULT_RUN_AS}`, nil, DnsOne::WORK_DIR
     end
 
     def setup_finished_msg

data/lib/dns_one/stat.rb

@@ -3,14 +3,15 @@ module DnsOne; class Stat
 
     def initialize conf = {}
         @conf = conf
-        
+	    
         # Setup logger and current working dir
-        DnsOne.new
+        DnsOne.new if @conf[:from_outside]
         
         ensure_db
     end
 
     def save rcode, req_resource, cache
+    	Log.i "saving stat (user: #{ `id -un #{Process.uid}` })"
         @db.execute(
             "INSERT INTO responses (time, rcode, req_resource, cache) VALUES (?, ?, ?, ?)", 
             [
@@ -48,7 +49,7 @@ module DnsOne; class Stat
     end
 
     def self.print
-        stat = new(db_file: DnsOne::DnsOne::STAT_DB, readonly: true)
+        stat = new(from_outside: true, readonly: true)
         %w(rcode req_resource cache).each do |key|
             puts "--- #{key} ---"
             stat.get_counts(key.to_sym).each_pair do |k, v|
@@ -116,10 +117,12 @@ module DnsOne; class Stat
         opts = {}
         opts[:readonly] = true if @conf[:readonly]
 
+	    Log.i "Opening stat db #{db_file} (cwd: #{Dir.pwd})."
         @db = SQLite3::Database.new db_file, opts
 
         if new_db
             File.chmod 0644, db_file
+    	    File.chown `id -u #{@conf[:user]}`.to_i, nil, db_file if @conf[:user]
             create_tables 
         end
     end

data/lib/dns_one/version.rb

@@ -1,3 +1,3 @@
 module DnsOne
-    VERSION = "0.4.31"
+    VERSION = "0.4.32"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dns_one
 version: !ruby/object:Gem::Version
-  version: 0.4.31
+  version: 0.4.32
 platform: ruby
 authors:
 - Tom Lobato