fix: knora upload scripts and configs

Dockerfile

@@ -9,6 +9,7 @@ COPY . /sipi
 RUN cd /sipi/build && \
     make install && \
     mkdir /sipi/images && \
+    mkdir /sipi/images/knora && \
     mkdir /sipi/cache && \
     rm -rf /sipi/vendor && \
     rm -rf /sipi/build && \

config/sipi.config.lua

@@ -85,6 +85,15 @@ sipi = {
     --
     subdir_levels = 1,
 
+    --
+    -- if subdir_levels is > 0 and if prefix_as_path is true, all prefixes will be
+    -- regarded as directories under imgroot. Thus, the subdirs 'A'-'Z' will be
+    -- created in these directories for the prefixes. However, it may make sense
+    -- for certain prefixes *not* to use subdirs. A list of these prefix-directories
+    -- can be given with this configuration parameter.
+    --
+    subdir_excludes = { "tmp", "thumb"},
+
     --
     -- Lua script which is executed on initialization of the Lua interpreter
     --

config/sipi.init-knora-test.lua

@@ -62,65 +62,71 @@ function pre_flight(prefix,identifier,cookie)
     end
 
 
-    -- comment this in if you do not want to do a preflight request
-    -- print("ignoring permissions")
-    -- do return 'allow', filepath end
+    if prefix == "knora" then
 
-    knora_cookie_header = nil
+        knora_cookie_header = nil
 
-    if cookie ~='' then
+        if cookie ~='' then
 
-        -- tries to extract the Knora session id from the cookie:
-        -- gets the digits between "sid=" and the closing ";" (only given in case of several key value pairs)
-        -- returns nil if it cannot find it
-        session_id = get_session_id(cookie)
+            -- tries to extract the Knora session id from the cookie:
+            -- gets the digits between "sid=" and the closing ";" (only given in case of several key value pairs)
+            -- returns nil if it cannot find it
+            session_id = get_session_id(cookie)
 
-        if session_id == nil then
-            -- no session_id could be extracted
-            print("cookie key is invalid")
-        else
-            knora_cookie_header = { Cookie = "KnoraAuthentication=" .. session_id }
+            if session_id == nil then
+                -- no session_id could be extracted
+                print("cookie key is invalid: " .. cookie)
+            else
+                knora_cookie_header = { Cookie = "KnoraAuthentication=" .. session_id }
+            end
         end
-    end
 
-    knora_url = 'http://' .. config.knora_path .. ':' .. config.knora_port .. '/v1/files/' .. identifier
+        knora_url = 'http://' .. config.knora_path .. ':' .. config.knora_port .. '/v1/files/' .. identifier
 
-    success, result = server.http("GET", knora_url, knora_cookie_header, 5000)
-    if not success then
-        server.log("server.http() failed: " .. result, server.loglevel.LOG_ERR)
-        return 'deny'
-    end
+        --print("knora_url: " .. knora_url)
 
-    if result.status_code ~= 200 then
-        server.log("Knora returned HTTP status code " .. result.status_code)
-        server.log(result.body)
-        return 'deny'
-    end
+        success, result = server.http("GET", knora_url, knora_cookie_header, 5000)
 
-    success, response_json = server.json_to_table(result.body)
-    if not success then
-        server.log("server.json_to_table() failed: " .. response_json, server.loglevel.LOG_ERR)
-        return 'deny'
-    end
+        -- check HTTP request was successful
+        if not success then
+            server.log("Server.http() failed: " .. result, server.loglevel.LOG_ERR)
+            return 'deny'
+        end
 
-    if response_json.status ~= 0 then
-        -- something went wrong with the request, Knora returned a non zero status
-        return 'deny'
-    end
+        if result.status_code ~= 200 then
+            server.log("Knora returned HTTP status code " .. result.status_code)
+            server.log(result.body)
+            return 'deny'
+        end
 
-    if response_json.permissionCode == 0 then
-        -- no view permission on file
-        return 'deny'
-    elseif response_json.permissionCode == 1 then
-        -- restricted view permission on file
-        -- either watermark or size (depends on project, should be returned with permission code by Sipi responder)
-        return 'restrict:size=' .. config.thumb_size, filepath
-    elseif response_json.permissionCode >= 2 then
-        -- full view permissions on file
-        return 'allow', filepath
-    else
-        -- invalid permission code
-        return 'deny'
+        success, response_json = server.json_to_table(result.body)
+        if not success then
+            server.log("Server.http() failed: " .. response_json, server.loglevel.LOG_ERR)
+            return 'deny'
+        end
+
+        --print("status: " .. response_json.status)
+        --print("permission code: " .. response_json.permissionCode)
+
+        if response_json.status ~= 0 then
+            -- something went wrong with the request, Knora returned a non zero status
+            return 'deny'
+        end
+
+        if response_json.permissionCode == 0 then
+            -- no view permission on file
+            return 'deny'
+        elseif response_json.permissionCode == 1 then
+            -- restricted view permission on file
+            -- either watermark or size (depends on project, should be returned with permission code by Sipi responder)
+            return 'restrict:size=' .. config.thumb_size, filepath
+        elseif response_json.permissionCode >= 2 then
+            -- full view permissions on file
+            return 'allow', filepath
+        else
+            -- invalid permission code
+            return 'deny'
+        end
     end
 
 end

config/sipi.init-knora.lua

@@ -56,72 +56,71 @@ function pre_flight(prefix, identifier, cookie)
     end
 
 
-    -- comment this in if you do not want to do a preflight request
-    -- print("ignoring permissions")
-    -- do return 'allow', filepath end
+    if prefix == "knora" then
 
-    knora_cookie_header = nil
+        knora_cookie_header = nil
 
-    if cookie ~='' then
+        if cookie ~='' then
 
-        -- tries to extract the Knora session id from the cookie:
-        -- gets the digits between "sid=" and the closing ";" (only given in case of several key value pairs)
-        -- returns nil if it cannot find it
-        session_id = get_session_id(cookie)
+            -- tries to extract the Knora session id from the cookie:
+            -- gets the digits between "sid=" and the closing ";" (only given in case of several key value pairs)
+            -- returns nil if it cannot find it
+            session_id = get_session_id(cookie)
 
-        if session_id == nil then
-            -- no session_id could be extracted
-            print("cookie key is invalid: " .. cookie)
-        else
-            knora_cookie_header = { Cookie = "KnoraAuthentication=" .. session_id }
+            if session_id == nil then
+                -- no session_id could be extracted
+                print("cookie key is invalid: " .. cookie)
+            else
+                knora_cookie_header = { Cookie = "KnoraAuthentication=" .. session_id }
+            end
         end
-    end
 
-    knora_url = 'http://' .. config.knora_path .. ':' .. config.knora_port .. '/v1/files/' .. identifier
-    --print("knora_url: " .. knora_url)
+        knora_url = 'http://' .. config.knora_path .. ':' .. config.knora_port .. '/v1/files/' .. identifier
 
-    success, result = server.http("GET", knora_url, knora_cookie_header, 5000)
+        --print("knora_url: " .. knora_url)
 
-    -- check HTTP request was successful
-    if not success then
-        server.log("Server.http() failed: " .. result, server.loglevel.LOG_ERR)
-        return 'deny'
-    end
+        success, result = server.http("GET", knora_url, knora_cookie_header, 5000)
 
-    if result.status_code ~= 200 then
-        server.log("Knora returned HTTP status code " .. result.status_code)
-        server.log(result.body)
-        return 'deny'
-    end
+        -- check HTTP request was successful
+        if not success then
+            server.log("Server.http() failed: " .. result, server.loglevel.LOG_ERR)
+            return 'deny'
+        end
 
-    success, response_json = server.json_to_table(result.body)
-    if not success then
-        server.log("Server.http() failed: " .. response_json, server.loglevel.LOG_ERR)
-        return 'deny'
-    end
+        if result.status_code ~= 200 then
+            server.log("Knora returned HTTP status code " .. result.status_code)
+            server.log(result.body)
+            return 'deny'
+        end
+
+        success, response_json = server.json_to_table(result.body)
+        if not success then
+            server.log("Server.http() failed: " .. response_json, server.loglevel.LOG_ERR)
+            return 'deny'
+        end
 
-    --print("status: " .. response_json.status)
-    --print("permission code: " .. response_json.permissionCode)
+        --print("status: " .. response_json.status)
+        --print("permission code: " .. response_json.permissionCode)
 
-    if response_json.status ~= 0 then
-        -- something went wrong with the request, Knora returned a non zero status
-        return 'deny'
-    end
+        if response_json.status ~= 0 then
+            -- something went wrong with the request, Knora returned a non zero status
+            return 'deny'
+        end
 
-    if response_json.permissionCode == 0 then
-        -- no view permission on file
-        return 'deny'
-    elseif response_json.permissionCode == 1 then
-        -- restricted view permission on file
-        -- either watermark or size (depends on project, should be returned with permission code by Sipi responder)
-        return 'restrict:size=' .. config.thumb_size, filepath
-    elseif response_json.permissionCode >= 2 then
-        -- full view permissions on file
-        return 'allow', filepath
-    else
-        -- invalid permission code
-        return 'deny'
+        if response_json.permissionCode == 0 then
+            -- no view permission on file
+            return 'deny'
+        elseif response_json.permissionCode == 1 then
+            -- restricted view permission on file
+            -- either watermark or size (depends on project, should be returned with permission code by Sipi responder)
+            return 'restrict:size=' .. config.thumb_size, filepath
+        elseif response_json.permissionCode >= 2 then
+            -- full view permissions on file
+            return 'allow', filepath
+        else
+            -- invalid permission code
+            return 'deny'
+        end
     end
-
 end
 -------------------------------------------------------------------------------

config/sipi.knora-config.lua

@@ -64,6 +64,25 @@ sipi = {
     --
     prefix_as_path = true,
 
+    --
+    -- In order not to accumulate to many files into one diretory (which slows down file
+    -- access considerabely), the images are stored in recursive subdirectories 'A'-'Z'.
+    -- If subdir_levels is equal 0, no subdirectories are used. The maximum is 6.
+    -- The recommandeation is that on average there should not me more than a few
+    -- thousand files in a unix directory (your mileage may vay depending on the
+    -- file system used).
+    --
+    subdir_levels = 1,
+
+    --
+    -- if subdir_levels is > 0 and if prefix_as_path is true, all prefixes will be
+    -- regarded as directories under imgroot. Thus, the subdirs 'A'-'Z' will be
+    -- created in these directories for the prefixes. However, it may make sense
+    -- for certain prefixes *not* to use subdirs. A list of these prefix-directories
+    -- can be given with this configuration parameter.
+    --
+    subdir_excludes = { "tmp", "thumbs"},
+
     --
     -- Lua script which is executed on initialization of the Lua interpreter
     --
@@ -107,13 +126,24 @@ sipi = {
     --
     -- Port of Knora Application
     --
-    knora_port = '3333'
+    knora_port = '3333',
 
+    --
+    -- loglevel, one of "EMERGENCY", "ALERT", "CRITICAL", "ERROR", "WARNING", "NOTICE", "INFORMATIONAL", "DEBUG"
+    --
+    loglevel = "DEBUG"
 }
 
 
 fileserver = {
+    --
+    -- directory where the documents for the normal webserver are located
+    --
     docroot = './server',
+
+    --
+    -- route under which the normal webserver shouöd respond to requests
+    --
     wwwroute = '/server'
 }
 

config/sipi.knora-docker-config.lua

@@ -64,6 +64,16 @@ sipi = {
     --
     prefix_as_path = true,
 
+    --
+    -- In order not to accumulate to many files into one diretory (which slows down file
+    -- access considerabely), the images are stored in recursive subdirectories 'A'-'Z'.
+    -- If subdir_levels is equal 0, no subdirectories are used. The maximum is 6.
+    -- The recommandeation is that on average there should not me more than a few
+    -- thousand files in a unix directory (your mileage may vay depending on the
+    -- file system used).
+    --
+    subdir_levels = 1,
+
     --
     -- Lua script which is executed on initialization of the Lua interpreter
     --
@@ -113,8 +123,15 @@ sipi = {
 
 
 fileserver = {
+    --
+    -- directory where the documents for the normal webserver are located
+    --
     docroot = '/sipi/server',
-    docroute = '/server'
+
+    --
+    -- route under which the normal webserver shouöd respond to requests
+    --
+    wwwroute = '/server'
 }
 
 --