src/client/lib/dnsmanager-client.cr

@@ -19,7 +19,7 @@ class DNSManager::Client < IPC
 	def login(token : String)
 		request = Request::Login.new token
 		send_now request
-		parse_message [ Response::Logged ], read
+		parse_message [ Response::Success ], read
 	end
 
 	#
@@ -94,18 +94,11 @@ class DNSManager::Client < IPC
 	# Admin stuff
 	#
 
-	def admin_maintenance(subject : Request::Maintenance::Subject,
-	                      int : Int32? = nil,
-	                      string : String? = nil)
+	def admin_maintenance(subject : Request::Maintenance::Subject, value : Int32? = nil)
 		request = Request::Maintenance.new(subject)
-		request.int = int if int
-		request.string = string if string
-		send_now request
-		parse_message [ Response::Success ], read
-	end
-
-	def generate_zonefile(domain : String)
-		request = Request::GenerateZoneFile.new(domain)
+		if value
+			request.value = value
+		end
 		send_now request
 		parse_message [ Response::Success ], read
 	end
@@ -130,7 +123,7 @@ class DNSManager::Client < IPC
 		m.not_nil!
 	end
 
-	# TODO: should raise exception if response not anticipated
+	# TODO: parse_message should raise exception if response not anticipated
 	def parse_message(expected_messages, message)
 		em = Array(IPC::JSON.class).new
 		expected_messages.each do |e|

src/client/main.cr

@@ -34,7 +34,6 @@ class Actions
 
 		# Maintenance.
 		@the_call["admin-maintenance"] = ->admin_maintenance
-		@the_call["admin-generate-zonefile"] = ->admin_generate_zonefile
 
 		# Domain operations.
 		@the_call["user-domain-add"]   = ->user_domain_add
@@ -64,11 +63,11 @@ class Actions
 				end
 
 				if past_is_verbosity
-					sub = DNSManager::Request::Maintenance::Subject::Verbosity
-					int = subject.to_i
-					@dnsmanagerd.admin_maintenance sub, int
+					sub   = DNSManager::Request::Maintenance::Subject::Verbosity
+					value = subject.to_i
+					@dnsmanagerd.admin_maintenance sub, value
 				else
-					sub = DNSManager::Request::Maintenance::Subject.parse(subject)
+					sub   = DNSManager::Request::Maintenance::Subject.parse(subject)
 					pp! sub
 					pp! @dnsmanagerd.admin_maintenance sub
 				end
@@ -78,18 +77,6 @@ class Actions
 		end
 	end
 
-	def admin_generate_zonefile
-		domains = Context.args.not_nil!
-		domains.each do |domain|
-			begin
-				pp! domain
-				pp! @dnsmanagerd.generate_zonefile domain
-			rescue e
-				puts "error for user_domain_add: #{e.message}"
-			end
-		end
-	end
-
 	def user_domain_add
 		domains = Context.args.not_nil!
 		domains.each do |domain|
@@ -233,21 +220,8 @@ def main
 		# Authd authentication, get the token and quit right away.
 		token = authd_get_token login: login, pass: pass
 		# Then push the token to the dnsmanager daemon.
-		logged_message = dnsmanagerd.login token
-		case logged_message
-		when DNSManager::Response::Logged
-			Baguette::Log.info "logged to dnsmanagerd"
-			Baguette::Log.debug "from logging message, accepted domains:"
-			logged_message.accepted_domains.each do |d|
-				Baguette::Log.debug "- #{d}"
-			end
-			Baguette::Log.debug "from logging message, owned domains:"
-			logged_message.my_domains.each do |d|
-				Baguette::Log.debug "- #{d}"
-			end
-		else
-			Baguette::Log.info "not logged to dnsmanagerd?"
-		end
+		dnsmanagerd.login token
+		Baguette::Log.info "logged."
 	end
 
 	actions = Actions.new dnsmanagerd, config

src/client/parser.cr

@@ -98,14 +98,6 @@ def parsing_cli(authd_config : Baguette::Configuration::Auth)
 				unrecognized_args_to_context_args.call parser, nil, 1
 			end
 
-			# Generate a zone file.
-			parser.on("genzone", "Generate a zone file.") do
-				Baguette::Log.info "generate a zone file on the server."
-				Context.command = "admin-generate-zonefile"
-				parser.banner = "COMMAND: admin genzone domain [domain…]"
-				unrecognized_args_to_context_args.call parser, nil, 1
-			end
-
 		end
 
 		# User section.

src/requests/admin.cr

@@ -4,14 +4,10 @@ class DNSManager::Request
 	IPC::JSON.message Maintenance, 7 do
 		enum Subject
 			Verbosity      # Change the verbosity of dnsmanagerd.
-			SanityCheck    # Perform various verifications, including:
-			               # - TODO: debug print and removal of domains not linked to existing users
-			               # - TODO: check that at least an admin exists
 		end
 
 		property subject : Subject
-		property int     : Int32?  = nil
-		property string  : String? = nil
+		property value : Int32?
 
 		def initialize(@subject)
 		end
@@ -25,36 +21,14 @@ class DNSManager::Request
 
 			case @subject
 			when Subject::Verbosity
-				if verbosity = @int
+				if verbosity = @value
 					Baguette::Context.verbosity = verbosity
 				end
 				Response::Success.new
-			when Subject::SanityCheck
-				Baguette::Log.info "TODO: sanity check"
-				Response::Error.new "not implemented"
 			else
 				Response::Error.new "not implemented"
 			end
 		end
 	end
 	DNSManager.requests << Maintenance
-
-	IPC::JSON.message GenerateZoneFile, 100 do
-		property domain : String
-
-		def initialize(@domain)
-		end
-
-		def handle(dnsmanagerd : DNSManager::Service, event : IPC::Event) : IPC::JSON
-			user = dnsmanagerd.get_logged_user event
-			return Response::ErrorUserNotLogged.new unless user
-
-			return Response::Error.new "unauthorized" unless user.admin
-			# This request means serious business.
-			# TODO: check for admin.
-
-			Response::Error.new "not implemented"
-		end
-	end
-	DNSManager.requests << GenerateZoneFile
 end