Merge branch 'WD_1.X_dev' of https://portal-ua.globallogic.com/git/wd into WD_1.X_dev

Author: Andrii Moroz

inc/webdriver_access.h

@@ -0,0 +1,39 @@
+#ifndef WEBDRIVER_ACCESS_H
+#define WEBDRIVER_ACCESS_H
+
+#include <string>
+#include <vector>
+#include <list>
+#include "base/file_util.h"
+
+namespace webdriver {
+
+struct AccessCommandTable
+{
+    std::string method;
+    std::string url;
+};
+
+struct AccessRule {
+    long hostIp;
+    bool isGeneralRule; //for all ip
+    bool allowed;
+    std::vector<AccessCommandTable> commandList;
+};
+
+class AccessValidator
+{
+public:
+    AccessValidator();
+    ~AccessValidator();
+    void setWhiteList(FilePath &xmlPath);
+    bool isAllowed(const long &remote_ip, const std::string &url, const std::string &method);
+
+private:
+    bool convertIpString(const char *str_ip, long *int_ip);
+    std::list<AccessRule> accessList;
+};
+
+}  // namespace webdriver
+
+#endif // WEBDRIVER_ACCESS_H

inc/webdriver_server.h

@@ -61,6 +61,7 @@ For all options please refer:
 #include "base/command_line.h"
 #include "base/memory/singleton.h"
 #include "base/values.h"
+#include "webdriver_access.h"
 
 struct mg_context;
 struct mg_connection;
@@ -127,6 +128,7 @@ class Server {
     std::string url_base_;
     struct mg_context* mg_ctx_;
     State state_;
+    AccessValidator accessValidor;
 
     void DispatchCommand(const std::string& matched_route,
                          Command* command_ptr,

inc/webdriver_switches.h

@@ -79,6 +79,13 @@ class Switches {
     /// if parameter specified, user input device enabled
     static const char kUserInputDevice[];
 
+    /// \page page_webdriver_switches WD Server switches
+    /// - <b>config</b><br>
+    /// The path to whitelist file (e.g. whitelist.xml) in
+    /// XML format with specified list of IP with allowed/disallowed
+    /// commands for each of them
+    static const char kWhiteList[];
+
 };
 
 }  // namespace webdriver

src/Test/BasicMouseInterfaceTest.h

@@ -5,6 +5,7 @@
 
 class BasicMouseInterfaceTestWidget : public QWidget
 {
+    Q_OBJECT
 public:
     explicit BasicMouseInterfaceTestWidget(QWidget *parent = 0);
 

src/Test/CoordinatesTest.h

@@ -5,6 +5,7 @@
 
 class CoordinatesTestWidget : public QWidget
 {
+    Q_OBJECT
 public:
     CoordinatesTestWidget();
     virtual ~CoordinatesTestWidget();

src/Test/DragableWidget.h

@@ -6,6 +6,7 @@
 
 class DragableWidget : public QWidget
 {
+    Q_OBJECT
 public:
     DragableWidget(QWidget *parent = 0);
     void setDraggingReportsDestination(QLabel* destination);

src/Test/FindingTest.h

@@ -5,6 +5,7 @@
 
 class FindingTestWidget : public QWidget
 {
+    Q_OBJECT
 public:
     FindingTestWidget();
     virtual ~FindingTestWidget();

src/Test/RestyledLabel.h

@@ -5,6 +5,7 @@
 
 class RestyledLabel : public QLabel
 {
+    Q_OBJECT
 public:
     RestyledLabel(const QString &text, QWidget *parent);
 };

src/Test/TextHandlingTest.h

@@ -27,6 +27,7 @@
 
 class TextHandlingTestWidget : public QWidget
 {
+    Q_OBJECT
 public:
     TextHandlingTestWidget();
     ~TextHandlingTestWidget();

src/Test/TouchTest.h

@@ -5,6 +5,7 @@
 
 class TouchTestWidget : public QWidget
 {
+    Q_OBJECT
 public:
     explicit TouchTestWidget(QWidget *parent = 0);