checkin from URL throw errors if response not HTTP OK

- redirect is not followed if protocol is changed, e.g. http-to-https,
  try http://www.ifcwiki.org/images/e/e3/AC20-FZK-Haus.ifc
- provide redirect URL in error messages, just in case
- throw error for other non-200 status codes as well
- check URL before initiating checkin to not leave dead topicIds behind

Author: hlg

BimServer/src/org/bimserver/webservices/impl/ServiceImpl.java

@@ -23,10 +23,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLDecoder;
+import java.net.*;
 import java.nio.file.FileAlreadyExistsException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -1311,6 +1308,7 @@ public SLongCheckinActionState checkinFromUrlSync(Long poid, String comment, Lon
 		String username = "Unknown";
 		String userUsername = "Unknown";
 		try {
+			URLConnection connection = openAndCheckResponseCode(urlString);
 			Long topicId = initiateCheckin(poid, deserializerOid);
 
 			User user = (User) readOnlySession.get(StorePackage.eINSTANCE.getUser(), getAuthorization().getUoid(), OldQuery.getDefault());
@@ -1322,13 +1320,9 @@ public SLongCheckinActionState checkinFromUrlSync(Long poid, String comment, Lon
 				throw new UserException("No project found with poid " + poid);
 			}
 
-			URL url = new URL(urlString);
-			URLConnection openConnection = url.openConnection();
-			InputStream input = openConnection.getInputStream();
-
 			Path incomingFile = getIncomingFileName(fileName, urlString, userUsername);
 
-			return checkinInternal(topicId, poid, comment, deserializerOid, (long) openConnection.getContentLength(), fileName, input, merge, true, readOnlySession, username, userUsername, project, incomingFile, -1);
+			return checkinInternal(topicId, poid, comment, deserializerOid, (long) connection.getContentLength(), fileName, connection.getInputStream(), merge, true, readOnlySession, username, userUsername, project, incomingFile, -1);
 
 //			DeserializerPluginConfiguration deserializerPluginConfiguration = session.get(StorePackage.eINSTANCE.getDeserializerPluginConfiguration(), deserializerOid, OldQuery.getDefault());
 //			if (deserializerPluginConfiguration == null) {
@@ -1368,6 +1362,7 @@ public Long checkinFromUrlAsync(Long poid, String comment, Long deserializerOid,
 		String username = "Unknown";
 		String userUsername = "Unknown";
 		try {
+			URLConnection connection = openAndCheckResponseCode(urlString);
 			Long topicId = initiateCheckin(poid, deserializerOid);
 
 			User user = (User) session.get(StorePackage.eINSTANCE.getUser(), getAuthorization().getUoid(), OldQuery.getDefault());
@@ -1387,9 +1382,6 @@ public Long checkinFromUrlAsync(Long poid, String comment, Long deserializerOid,
 				throw new UserException("No project found with poid " + poid);
 			}
 
-			URL url = new URL(urlString);
-			URLConnection openConnection = url.openConnection();
-			InputStream input = openConnection.getInputStream();
 			DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss-SSS");
 			if (fileName == null) {
 				if (urlString.contains("/")) {
@@ -1409,7 +1401,7 @@ public Long checkinFromUrlAsync(Long poid, String comment, Long deserializerOid,
 				fileName = fileName.replace(" ", "_");
 			}
 
-			SLongCheckinActionState checkinInternal = checkinInternal(topicId, poid, comment, deserializerOid, (long) openConnection.getContentLength(), fileName, input, merge, false, session, username, userUsername, project, file, -1);
+			SLongCheckinActionState checkinInternal = checkinInternal(topicId, poid, comment, deserializerOid, (long) connection.getContentLength(), fileName, connection.getInputStream(), merge, false, session, username, userUsername, project, file, -1);
 			return checkinInternal.getTopicId();
 //			DeserializerPluginConfiguration deserializerPluginConfiguration = session.get(StorePackage.eINSTANCE.getDeserializerPluginConfiguration(), deserializerOid, OldQuery.getDefault());
 //			if (deserializerPluginConfiguration == null) {
@@ -1424,7 +1416,7 @@ public Long checkinFromUrlAsync(Long poid, String comment, Long deserializerOid,
 //			deserializer.init(getBimServer().getDatabase().getMetaDataManager().getPackageMetaData("ifc2x3tc1"));
 //
 //			IfcModelInterface model = deserializer.read(inputStream, fileName, 0, null);
-//			
+//
 //			CheckinDatabaseAction checkinDatabaseAction = new CheckinDatabaseAction(getBimServer(), null, getInternalAccessMethod(), poid, getAuthorization(), model, comment, fileName, merge);
 //			LongCheckinAction longAction = new LongCheckinAction(-1L, getBimServer(), username, userUsername, getAuthorization(), checkinDatabaseAction);
 //			getBimServer().getLongActionManager().start(longAction);
@@ -1442,6 +1434,23 @@ public Long checkinFromUrlAsync(Long poid, String comment, Long deserializerOid,
 		}
 	}
 
+	private static URLConnection openAndCheckResponseCode(String urlString) throws IOException, UserException {
+		URL url = new URL(urlString);
+		URLConnection connection = url.openConnection();
+		if(connection instanceof HttpURLConnection){
+			HttpURLConnection httpConnection = (HttpURLConnection) connection;
+			int responseCode = httpConnection.getResponseCode();
+			if(responseCode != HttpURLConnection.HTTP_OK){
+				if (responseCode ==HttpURLConnection.HTTP_MOVED_PERM || responseCode == HttpURLConnection.HTTP_MOVED_TEMP){
+					String next = httpConnection.getHeaderField("Location");
+					throw new UserException("Redirecting to " + next + ", use this URL directly.");
+				}
+				throw new UserException("Connection error, HTTP status " + responseCode);
+			}
+		}
+		return connection;
+	}
+
 	@Override
 	public SUser addUser(String username, String name, SUserType type, Boolean selfRegistration, String resetUrl) throws ServerException, UserException {
 		DatabaseSession session = getBimServer().getDatabase().createSession(OperationType.POSSIBLY_WRITE);

BimServerWar/pom.xml

@@ -15,7 +15,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-war-plugin</artifactId>
-				<version>2.6</version>
+				<version>3.4.0</version>
 				<configuration>
 					<webResources>
 						<resource>