Merge pull request #83 from clarin-eric/dev

Dev

Author: Wolfgang Walter SAUER

curation-module-core/pom.xml

@@ -3,11 +3,11 @@
     <parent>
         <artifactId>curation-module</artifactId>
         <groupId>eu.clarin.cmdi</groupId>
-        <version>5.0.5</version>
+        <version>5.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>curation-module-core</artifactId>
-    <version>5.0.5</version>
+    <version>5.0.6</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <slf4j.version>1.7.25</slf4j.version>
@@ -70,7 +70,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>28.1-jre</version>
+            <version>30.0-jre</version>
         </dependency>
         <dependency>
             <groupId>commons-cli</groupId>

curation-module-core/script/weeklyUpdate.sh

@@ -51,16 +51,21 @@ set -e
 
 echo "generating new reports, downloading necessary profiles..."
 java $VM_ARGS -Dprojectname=curate $LOG4J -jar $BIN_DIR/curate.jar -config $CONF_DIR/config.properties -r -path $DATA_DIR/clarin/$CMDI_PATH $DATA_DIR/europeana/$CMDI_PATH
-echo "report generation finished. creating value maps..."
+echo "report generation finished."
 
-# create value maps
-for name in resourceClass_tf-extended profileName2resourceClass_tf-extended_noResourceClassProfiles collection modality organisation; do
-	curl -O https://raw.githubusercontent.com/acdh-oeaw/VLO-mapping/master/value-maps/$name.csv
-	java -jar $BIN_DIR/vlo-mapping-creator.jar $name.csv > $WORK_DIR/value_maps/$name.xml
-	rm $name.csv
-done
+if [ -e "$BIN_DIR/vlo-mapping-creator.jar" ]; then
+	echo "creating value maps..."
+	# create value maps
+	for name in resourceClass_tf-extended profileName2resourceClass_tf-extended_noResourceClassProfiles collection modality organisation; do
+		curl -O https://raw.githubusercontent.com/acdh-oeaw/VLO-mapping/master/value-maps/$name.csv
+		java -jar "$BIN_DIR/vlo-mapping-creator.jar" $name.csv > $WORK_DIR/value_maps/$name.xml
+		rm $name.csv
+	done
+	echo "Finished!"
+else
+	echo "Skipping value map creation - mapping creator binary not found"
+fi
 
-echo "Finished!"
 ELAPSED_TIME=$(($SECONDS - $START_TIME))
 echo "Elapsed time: $(($ELAPSED_TIME/60)) min"
 echo "please restart curate webapp with 'docker-manage -e clarin-curate -v'"

curation-module-core/src/main/java/eu/clarin/cmdi/curation/main/Configuration.java

@@ -138,6 +138,8 @@ private static void readProperties(Properties config) throws IOException {
 
         USERAGENT = config.getProperty("USERAGENT");
         BASE_URL = config.getProperty("BASE_URL");
+        if(!BASE_URL.endsWith("/"))
+        	BASE_URL += "/";
     }
 
     public static class StormycheckerConstants{

curation-module-core/src/main/java/eu/clarin/cmdi/curation/report/CMDInstanceReport.java

@@ -99,7 +99,7 @@ public static class URLElement {
         public String message;
 
         @XmlAttribute(name = "http-status")
-        public int status;
+        public Integer status;
 
         @XmlAttribute(name = "content-type")
         public String contentType;
@@ -201,9 +201,8 @@ private static synchronized void mergeWithParent(CollectionReport parentReport,
             parentReport.xmlValidationReport.record.add(record);
         }
 
-
-        parentReport.urlReport.totNumOfLinks += instanceReport.urlReport.numOfLinks;
         //will be done through database
+        parentReport.urlReport.totNumOfLinks += instanceReport.urlReport.numOfLinks;
 //        parentReport.urlReport.totNumOfBrokenLinks += instanceReport.urlReport.numOfBrokenLinks;
 //        parentReport.urlReport.totNumOfCheckedLinks += instanceReport.urlReport.numOfCheckedLinks;
 

curation-module-web/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>eu.clarin.cmdi</groupId>
         <artifactId>curation-module</artifactId>
-        <version>5.0.5</version>
+        <version>5.0.6</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -81,7 +81,7 @@
         <dependency>
             <groupId>eu.clarin.cmdi</groupId>
             <artifactId>curation-module-core</artifactId>
-            <version>5.0.5</version>
+            <version>5.0.6</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

curation-module-web/src/main/java/eu/clarin/routes/Record.java

@@ -14,6 +14,8 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.nio.file.LinkOption;
+import java.nio.file.Paths;
 
 //this route is to make records available to view
 @Path("/record")
@@ -23,7 +25,12 @@ public class Record {
     @Path("/{filepath : .+}")
     public Response handleView(@PathParam("filepath") String filePath) {
         try {
-            String file = FileManager.readFile(Configuration.RECORDS_PATH + "/" + filePath);
+        	// the next three lines assure that the path is a sub-path of RECORDS_PATH
+        	java.nio.file.Path path = Paths.get(Configuration.RECORDS_PATH, filePath).toRealPath(LinkOption.NOFOLLOW_LINKS);
+        	if(!path.startsWith(Configuration.RECORDS_PATH))
+        		return ResponseManager.returnError(404, "Path not permitted.");
+        	
+            String file = FileManager.readFile(path.toString());
             return ResponseManager.returnResponse(200, file, MediaType.TEXT_XML);
 
         } catch (IOException e) {