Merge lp:~angeloc/unity-lens-files/fix-for-948086 into lp:unity-lens-files

[Angelo Compagnucci]

More robust url validation.

[Michal Hruby (mhr3)]

Can you please set your branch which fixes the mountable uris as a prerequisite branch for this?

review: Needs Resubmitting

[Michal Hruby (mhr3)]

Can we move all the TLDs into a const string, so that we'll have just:

web_regex = new Regex ("(http[s]{0,1}://.+){0,1}[a-zA-Z0-9\\-\\.]+\\." + TLD_REGEX + "$");

Also, this regex should be definitely compiled with RegexCompileFlags.OPTIMIZE

review: Needs Fixing

[Angelo Compagnucci (angeloc)]

Done!

Splitting regex into const string
Use OPTIMIZE flag for regexp

[Angelo Compagnucci (angeloc)]

Done!

Codestyle fixed!

[Michal Hruby (mhr3)]

Looking good to me.

review: Approve

[Unity Merger (unity-merger)]

The prerequisite lp:~angeloc/unity-lens-files/fix-for-773841 has not yet been merged into lp:unity-lens-files.

[Mikkel Kamstrup Erlandsen (kamstrup)]

Sorry, seems this branch slipped past my watchful eye

This branch caused a regression. You can no longer type in a URL with path, query, or fragment components. The regex doesn't match beyond the tld.

review: Needs Fixing

[Michal Hruby (mhr3)]

Added tests in https://code.launchpad.net/~mhr3/unity-lens-files/moar-tests/+merge/98373

=== modified file 'src/url-checker.vala'
--- src/url-checker.vala	2012-03-07 15:17:18 +0000
+++ src/url-checker.vala	2012-03-07 15:17:18 +0000
@@ -34,6 +34,18 @@
     /* Regexes URLs must match */
     private Regex web_regex;
     private Regex mountable_regex;
+    private const string TLD_REGEX = "(ac|ad|ae|aero|af|ag|ai|al|am|an|ao|aq|ar|arpa|"    +
+      "as|asia|at|au|aw|ax|az|ba|bb|bd|be|bf|bg|bh|bi|biz|bj|bm|bn|bo|br|bs|bt|bv|bw|"    +
+      "by|bz|ca|cat|cc|cd|cf|cg|ch|ci|ck|cl|cm|cn|co|com|coop|cr|cu|cv|cw|cx|cy|cz|de|"   +
+      "dj|dk|dm|do|dz|ec|edu|ee|eg|er|es|et|eu|fi|fj|fk|fm|fo|fr|ga|gb|gd|ge|gf|gg|gh|"   +
+      "gi|gl|gm|gn|gov|gp|gq|gr|gs|gt|gu|gw|gy|hk|hm|hn|hr|ht|hu|id|ie|il|im|in|info|"    +
+      "int|io|iq|ir|is|it|je|jm|jo|jobs|jp|ke|kg|kh|ki|km|kn|kp|kr|kw|ky|kz|la|lb|lc|"    +
+      "li|lk|lr|ls|lt|lu|lv|ly|ma|mc|md|me|mg|mh|mil|mk|ml|mm|mn|mo|mobi|mp|mq|mr|ms|mt|" +
+      "mu|museum|mv|mw|mx|my|mz|na|name|nc|ne|net|nf|ng|ni|nl|no|np|nr|nu|nz|om|org|pa|"  +
+      "pe|pf|pg|ph|pk|pl|pm|pn|pr|pro|ps|pt|pw|py|qa|re|ro|rs|ru|rw|sa|sb|sc|sd|se|sg|"   +
+      "sh|si|sj|sk|sl|sm|sn|so|sr|st|su|sv|sx|sy|sz|tc|td|tel|tf|tg|th|tj|tk|tl|tm|tn|"   +
+      "to|tp|tr|travel|tt|tv|tw|tz|ua|ug|uk|us|uy|uz|va|vc|ve|vg|vi|vn|vu|wf|ws|xn|xxx|"  +
+      "ye|yt|za|zm|zw|local|[0-9]{1,3})";
     
     public UrlChecker ()
     {
@@ -41,7 +53,9 @@
       mountable_icon = new ThemedIcon ("folder-remote").to_string ();
       
       try {
-        web_regex = new Regex ("([a-zA-Z0-9\\-]+\\...+|http[s]{0,1}://.+)");
+        web_regex = new Regex ("(http[s]{0,1}://.+){0,1}" +
+                                "[a-zA-Z0-9\\-\\.]+\\." + TLD_REGEX + "$",
+                                RegexCompileFlags.OPTIMIZE);
         mountable_regex = new Regex ("(\\\\|(ftp|ssh|sftp|smb|dav)://).+");
       } catch (RegexError e) {
         warning ("Error compiling regular expressions for URL matching. URL launching will not work: %s", e.message);