added handling other custom commands (no session)

Author: nataliakoval

inc/webdriver_route_table.h

@@ -138,6 +138,11 @@ class RouteTable {
     bool AddRoute(const std::string& uri_pattern,
                   const CommandCreatorPtr& creator);
 
+    // check custom prefix, should be of the form:
+    // '-' + vendor prefix + '-' + command name
+    // return true if prefix correct
+    bool CheckCustomPrefix(const std::string& prefix);
+
     // return true if pattern1 is bestmatch then pattern2
     bool CompareBestMatch(const std::string& uri_pattern1, const std::string& uri_pattern2);
 

src/webdriver/webdriver_route_table.cc

@@ -119,28 +119,23 @@ bool RouteTable::AddRoute(const std::string& uri_pattern,
         std::vector<std::string> url_segments;
         base::SplitString(uri_pattern, '/', &url_segments);
 
-        if (url_segments.size() < 4
-                || !url_segments[0].empty() || url_segments[1] != "session" || url_segments[2] != "*") {
-            GlobalLogger::Log(kWarningLogLevel, "Custom commands must begin with \"/session/*/\"");
+        if (url_segments.size() < 2
+                || !url_segments[0].empty()) {
+            GlobalLogger::Log(kWarningLogLevel, "Custom commands too short");
             return false;
         }
-
-        // check custom prefix, should be of the form:
-        // '-' + vendor prefix + '-' + command name
-        std::vector<std::string> prefix_segments;
-        base::SplitString(url_segments[3], '-', &prefix_segments);
-#if defined(OS_WIN)
-        if (prefix_segments.size() < 3 || !prefix_segments[0].empty() || prefix_segments[2].empty()
-                || prefix_segments[1].empty() || !isalpha(prefix_segments[1].at(0))) {
-#else //OS_WIN
-		if (prefix_segments.size() < 3 || !prefix_segments[0].empty() || prefix_segments[2].empty()
-				|| prefix_segments[1].empty() || !std::isalpha(prefix_segments[1].at(0))) {
-#endif //OS_WIN
-
-			GlobalLogger::Log(kWarningLogLevel, "Custom prefix invalid");
+        if (url_segments.size() >= 2
+                && url_segments[0].empty() && url_segments[1] != "session") {
+            if (!CheckCustomPrefix(url_segments[1]))
+                return false;
+        } else  if (url_segments.size() < 4 || !url_segments[0].empty()
+                    || url_segments[1] != "session" || url_segments[2] != "*") {
+            GlobalLogger::Log(kWarningLogLevel, "Invalid custom commands");
             return false;
+        } else {
+            if (!CheckCustomPrefix(url_segments[3]))
+                return false;
         }
-
     }
     std::vector<webdriver::internal::RouteDetails>::iterator route;
     for (route = routes_.begin();
@@ -165,6 +160,23 @@ bool RouteTable::AddRoute(const std::string& uri_pattern,
     return true;
 }
 
+bool RouteTable::CheckCustomPrefix(const std::string& prefix) {
+    std::vector<std::string> prefix_segments;
+    base::SplitString(prefix, '-', &prefix_segments);
+#if defined(OS_WIN)
+    if (prefix_segments.size() < 3 || !prefix_segments[0].empty() || prefix_segments[2].empty()
+            || prefix_segments[1].empty() || !isalpha(prefix_segments[1].at(0))) {
+#else //OS_WIN
+    if (prefix_segments.size() < 3 || !prefix_segments[0].empty() || prefix_segments[2].empty()
+            || prefix_segments[1].empty() || !std::isalpha(prefix_segments[1].at(0))) {
+#endif //OS_WIN
+
+        GlobalLogger::Log(kWarningLogLevel, "Custom prefix invalid");
+        return false;
+    }
+    return true;
+}
+
 bool RouteTable::MatchPattern(const std::string& url, const std::string& pattern) const {
     std::vector<std::string> url_segments;
     std::vector<std::string> pattern_segments;