Use go-iiif v7 from original repo

Therefore the image-id has to be url-encoded which the indexer has to do
when generating the manifest. So indexer update is necessarry

Author: joschrew

docker-compose.cluster.yaml

@@ -107,24 +107,19 @@ services:
           - es
           - search
 
-  go-iiif:
-    image: ghcr.io/subugoe/go-iiif:develop
+  olahds_image_server:
     container_name: olahds_image_server
-    command: /go/iiif-server -server-uri http://0.0.0.0:8080 -config-source file:///etc/iiif-server
-    working_dir: /go
-    volumes:
-      - ./cfg/go-iiif/config.json:/etc/iiif-server/config.json
-      - ./cfg/go-iiif/instructions.json:/etc/iiif-server/instructions.json
-    env_file:
-      - .env
+    build:
+      context: https://github.com/go-iiif/go-iiif.git#v7.0.2
+    command: /bin/iiif-server -server-uri "http://0.0.0.0:8090" -config-images-source-uri "rfc6570://?template=http://backend:8080/download-image?id={id}"
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.go-iiif.entrypoints=web"
       - "traefik.http.routers.go-iiif.rule=PathPrefix(`/images`)"
       - "traefik.http.routers.go-iiif.middlewares=stripprefix_images"
       - "traefik.http.middlewares.stripprefix_images.stripprefix.prefixes=/images"
     ports:
-      - "6701:8080"
+      - "6701:8090"
     networks:
       olahd:
         aliases:

docker-compose.localdev.yaml

@@ -120,6 +120,18 @@ services:
           - olahds_s3
           - s3
 
+  olahds_image_server:
+    container_name: olahds_image_server
+    build:
+      context: https://github.com/go-iiif/go-iiif.git#v7.0.2
+    command: /bin/iiif-server -server-uri "http://0.0.0.0:8090" -config-images-source-uri "rfc6570://?template=http://172.17.0.1:8080/download-image?id={id}"
+    ports:
+      - "8090:8090"
+    networks:
+      olahd:
+        aliases:
+          - images
+          - image-server
 
 volumes:
   redisdata:

src/main/java/de/ocrd/olahd/config/SecurityConfig.java

@@ -45,8 +45,7 @@ protected void configure(HttpSecurity http) throws Exception {
             .authorizeRequests()
                 .antMatchers("/export/**",
                         "/export-full/**",
-                        "/download",
-                        "/download-file/**",
+                        "/download*",
                         "/login",
                         "/search*/**",
                         "/iiif/**",

src/main/java/de/ocrd/olahd/controller/ExportController.java

@@ -191,6 +191,33 @@ public ResponseEntity<Resource> downloadFile(
             .header(HttpHeaders.CONTENT_LENGTH, contentLength + "").body(resource);
     }
 
+    static final String REGEX_IMAGE_ID = "^(.*?)&.*?path=([^\\s]+)$";
+    static final java.util.regex.Pattern PATTERN_IMAGE_ID = java.util.regex.Pattern.compile(REGEX_IMAGE_ID);
+
+    @ApiOperation(value = "Endpoint for go-iiif to get images")
+    @ApiResponses({
+        @ApiResponse(code = 200, message = "File successfully transfered.", response = byte[].class),
+        @ApiResponse(code = 404, message = "File or archive not found.", response = byte[].class),
+        @ApiResponse(code = 409, message = "File only available on tape.", response = byte[].class),
+    })
+    @GetMapping(value = "/download-image", produces = { MediaType.APPLICATION_XML_VALUE,
+        MediaType.TEXT_PLAIN_VALUE, MediaType.APPLICATION_OCTET_STREAM_VALUE })
+    public ResponseEntity<Resource> downloadImage(
+        @ApiParam(value = "Image id used by go-iiif image server", required = true) @RequestParam("id")
+        String imageId
+    ) throws IOException {
+        String pid = null;
+        String path = null;
+        java.util.regex.Matcher matcher = PATTERN_IMAGE_ID.matcher(imageId);
+        if (matcher.find()) {
+            pid = matcher.group(1);
+            path = matcher.group(2);
+        } else {
+            throw new HttpClientErrorException(HttpStatus.UNPROCESSABLE_ENTITY, ErrMsg.CANNOT_PARSE_IMAGE_ID);
+        }
+        return this.downloadFile(pid, false, path);
+    }
+
     /**
      * Export data using {@linkplain ArchiveManagerService}
      *

src/main/java/de/ocrd/olahd/msg/ErrMsg.java

@@ -28,6 +28,6 @@ private ErrMsg() {
     public static final String FILE_NOT_A_TIFF = "Given file is not a tiff image";
     public static final String TIFF_CONVERT_ERROR = "Error converting tiff to jpeg";
     public static final String IIIF_MANIFEST_NOT_FOUND = "IIIF-Manifest not found";
-
+    public static final String CANNOT_PARSE_IMAGE_ID = "Cannot parse PID and filepath from image-id";
 
 }