From fdbc07b3776a2a5c0e191a05f2ef29aa513fd70b Mon Sep 17 00:00:00 2001
From: Simon Voordouw <simonvoordouw@gmail.com>
Date: Thu, 6 Jul 2017 14:39:28 +0200
Subject: [PATCH] use accessManager.hasControl. Fixes issue #75

---
 src/rest/api/api_printer.lua | 35 +++++++++--------------------------
 1 file changed, 9 insertions(+), 26 deletions(-)

diff --git a/src/rest/api/api_printer.lua b/src/rest/api/api_printer.lua
index f898bb4..3c9ca98 100644
--- a/src/rest/api/api_printer.lua
+++ b/src/rest/api/api_printer.lua
@@ -224,30 +224,22 @@ local function addSequenceNumbering(printer, response)
 end
 
 function M.fetch_POST(request, response)
-	local printer,msg = printerUtils.createPrinterOrFail(argId, response)
-	if not printer or not printer:hasSocket() then return end
-
-	local controllerIP = accessManager.getController()
-	local hasControl = false
-	if controllerIP == "" then
-		accessManager.setController(request.remoteAddress)
-		hasControl = true
-	elseif controllerIP == request.remoteAddress then
-		hasControl = true
-	end
-
-	if not hasControl then
+	if not accessManager.hasControl(request.remoteAddress) then
 		response:setFail("No control access")
 		return
+	else
+		accessManager.setController(request.remoteAddress)
 	end
 
+	local printer,msg = printerUtils.createPrinterOrFail(argId, response)
+	if not printer or not printer:hasSocket() then return end
+
 	local state = printer:getState()
 	if state ~= "idle" then
 		response:setFail("printer is not idle")
 		return
 	end
 
-
 	log:verbose(MOD_ABBR, "  clearing all gcode for " .. printer:getId())
 	stopFetch()
 	local rv,msg = printer:clearGcode()
@@ -281,7 +273,6 @@ function M.fetch_POST(request, response)
                         return
                 end
                 endCodeFile:write(endCode)
-
 	end
 
 	local socket = printer:getId()
@@ -318,20 +309,12 @@ end
 --         a fail with a (formal, i.e., parseable) status argument will be returned;
 --         additionally, current sequence number and total will be returned (both are -1 if they have not been set)
 function M.print_POST(request, response)
-	local controllerIP = accessManager.getController()
-	local hasControl = false
-	if controllerIP == "" then
-		accessManager.setController(request.remoteAddress)
-		hasControl = true
-	elseif controllerIP == request.remoteAddress then
-		hasControl = true
-	end
-
-	if not hasControl then
+	if not accessManager.hasControl(request.remoteAddress) then
 		response:setFail("No control access")
 		return
+	else
+		accessManager.setController(request.remoteAddress)
 	end
-
 	local argId = request:get("id")
 	local argGcode = request:get("gcode")
 	local argClear = utils.toboolean(request:get("clear"))