Changeset 1084:654bdc23be93

Timestamp:

05/18/10 11:13:37 (3 years ago)

Author:

tgambet

Branch:

default

convert_revision:

svn:cdcfb263-7567-472c-a848-e2c2df3466e7/trunk@1085

Message:

fixed uri syntax check

Files:

• src/org/w3c/unicorn/input/URIInputParameter.java (modified) (2 diffs)

src/org/w3c/unicorn/input/URIInputParameter.java

@@ -66 +66 @@
                                 throw new UnicornException();
                         
-                        Pattern urlPattern = Pattern.compile("^(https?)://([A-Z0-9][A-Z0-9_-]*)(\\.[A-Z0-9][A-Z0-9_-]*)*(:(\\d+))?([/#]\\p{ASCII}*)?", Pattern.CASE_INSENSITIVE);
-                        if (!urlPattern.matcher(uri).matches()) {
-                                if (!uri.contains("://")) 
+                        //Pattern urlPattern = Pattern.compile("^(https?)://([A-Z0-9][A-Z0-9_-]*)(\\.[A-Z0-9][A-Z0-9_-]*)+(:(\\d+))?([/#]\\p{ASCII}*)?", Pattern.CASE_INSENSITIVE);
+                        Pattern protocolPattern = Pattern.compile("^\\p{Alpha}*://.*");
+                        try {
+                                docUrl = new URL(uri);
+                        } catch (MalformedURLException e) {
+                                if (protocolPattern.matcher(uri).matches())
+                                        throw e;
+                                else {
                                         uri = "http://" + uri;
-                                if (!urlPattern.matcher(uri).matches())
-                                        throw new UnicornException(Message.ERROR, "$message_invalid_url_syntax", null, uri);
+                                        docUrl = new URL(uri);
+                                } 
                         }
-                        docUrl = new URL(uri);
+                        
                         if (!docUrl.getProtocol().equals("http") && !docUrl.getProtocol().equals("https"))
                                 throw new UnicornException(Message.ERROR, "$message_unsupported_protocol", null, docUrl.getProtocol());
@@ -100 +105 @@
                         inputModule = new URIInputModule(mimeType, uri);
                 } catch (MalformedURLException e) {
-                        throw new UnicornException(Message.ERROR, "$message_invalid_url_syntax", null, uri);
+                        throw new UnicornException(Message.ERROR, "$message_invalid_url_syntax", e.getMessage(), uri);
                 } catch (MimeTypeParseException e) {
                         throw new UnicornException(Message.ERROR, "$message_invalid_mime_type");