Dev/mvp/ilya

.github/workflows/ci.yml

@@ -0,0 +1,29 @@
+on: push
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    container: stepanpopov/rabbit_hole
+    steps:
+      - uses: actions/checkout@v2 
+      - run: make check
+
+  build:
+    runs-on: ubuntu-latest
+    container: stepanpopov/rabbit_hole
+    needs: [check]
+    steps:
+    - uses: actions/checkout@v2 
+    - run: make build
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v2
+      with:
+        path: ./server/build/report
+
+  memtest:
+    runs-on: ubuntu-latest
+    container: stepanpopov/rabbit_hole
+    needs: [build]
+    steps:
+      - uses: actions/checkout@v2
+      - run: make memtest

.gitignore

@@ -0,0 +1,16 @@
+# Cmake
+*/build
+*/**/build
+
+# Executables
+*.exe
+*.out
+*.app
+
+#IDE
+.idea
+.vscode
+
+# Logs
+*.log
+/server/logic/src/*.md

CPPLINT.cfg

@@ -0,0 +1,8 @@
+headers=h
+linelength=110
+filter=-whitespace/tab
+filter=-runtime/int
+filter=-legal/copyright
+filter=-build/include_subdir
+filter=-build/include
+filter=-readability/casting

Dockerfile

@@ -0,0 +1,18 @@
+FROM gcc:latest
+RUN apt update -y && \
+    apt install -y cppcheck clang-tidy python3-pip libc6-dbg cmake libgtest-dev lcov libpqxx-dev
+RUN pip install cpplint
+RUN wget https://sourceware.org/pub/valgrind/valgrind-3.18.1.tar.bz2 && \
+    tar xfv valgrind-3.18.1.tar.bz2 && \
+    cd valgrind-3.18.1 && \
+    ./autogen.sh && \
+    ./configure && \
+    make && \
+    make install
+RUN cd /root && \
+    wget https://boostorg.jfrog.io/artifactory/main/release/1.77.0/source/boost_1_77_0.tar.bz2 && \
+    tar -xjf boost_1_77_0.tar.bz2 && \
+    mv boost_1_77_0 /usr/local && \
+    cd /usr/local/boost_1_77_0 && \
+    ./bootstrap.sh && \
+    ./b2 --with-system --with-thread --with-date_time --with-regex --with-serialization stage

Makefile

@@ -0,0 +1,22 @@
+.PHONY: all build rebuild check memtest clean
+
+all: clean check build memtest
+
+clean:
+	rm -rf */build
+
+check:
+	./scripts/linters/run.sh
+
+build:
+	./scripts/build.sh -DMEMCHECK=OFF
+
+rebuild: clean build
+
+test:
+	./scripts/build.sh -DMEMCHECK=OFF
+	./scripts/tests.sh
+
+memtest:
+	./scripts/build.sh -DMEMCHECK=ON
+	./scripts/tests.sh

_sql/init_up.sql

@@ -0,0 +1,6 @@
+CREATE TABLE users (
+    id            serial       not null unique,
+    name          varchar(255) not null,
+    username      varchar(255) not null unique,
+    password_hash varchar(255) not null
+);

client/CMakeLists.txt

@@ -0,0 +1,21 @@
+cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
+project(client)
+
+SET(CMAKE_CXX_STANDARD 17)
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror -Wno-error=unused-parameter -Wno-error=unused-variable")
+
+# set(BOOST_INCLUDE_DIRS "/usr/local/boost_1_77_0")
+add_subdirectory(network)
+
+# include_directories(${NETWORK_INCLUDE_DIRS}  ${BOOST_INCLUDE_DIRS})
+
+include_directories(${NETWORK_INCLUDE_DIRS})
+
+add_executable(${PROJECT_NAME} main.cpp)
+
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -coverage -lgcov" )
+
+target_link_libraries(${PROJECT_NAME} PUBLIC ${NETWORK_LIBRARIES})
+
+# enable_testing()
+# add_subdirectory(tests)

client/gui/CMakeLists.txt

@@ -0,0 +1,62 @@
+cmake_minimum_required(VERSION 3.5)
+
+project(gui VERSION 0.1 LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets)
+find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)
+
+set(PROJECT_SOURCES
+        include/*
+        main.cpp
+        widget.ui
+)
+
+if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
+    qt_add_executable(gui
+        MANUAL_FINALIZATION
+        ${PROJECT_SOURCES}
+    )
+# Define target properties for Android with Qt 6 as:
+#    set_property(TARGET gui APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR
+#                 ${CMAKE_CURRENT_SOURCE_DIR}/android)
+# For more information, see https://doc.qt.io/qt-6/qt-add-executable.html#target-creation
+else()
+    if(ANDROID)
+        add_library(gui SHARED
+            ${PROJECT_SOURCES}
+        )
+# Define properties for Android with Qt 5 after find_package() calls as:
+#    set(ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/android")
+    else()
+        add_executable(gui
+            ${PROJECT_SOURCES}
+        )
+    endif()
+endif()
+
+target_link_libraries(gui PRIVATE Qt${QT_VERSION_MAJOR}::Widgets)
+
+set_target_properties(gui PROPERTIES
+    MACOSX_BUNDLE_GUI_IDENTIFIER my.example.com
+    MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
+    MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
+    MACOSX_BUNDLE TRUE
+    WIN32_EXECUTABLE TRUE
+)
+
+install(TARGETS gui
+    BUNDLE DESTINATION .
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+if(QT_VERSION_MAJOR EQUAL 6)
+    qt_finalize_executable(gui)
+endif()

client/gui/include/tools/utils.h

@@ -0,0 +1,5 @@
+#pragma once
+
+#include <iostream>
+#include <string>
+#include <vector>

client/gui/include/tools/vpncontext.h

@@ -0,0 +1,14 @@
+#pragma once
+
+#include "utils.h"
+
+enum VPNMode {
+    RunTotal = 1,
+    RunOptional,
+    Stopped
+};
+
+struct VPNContext {
+    VPNMode state = VPNMode::RunTotal;
+    std::vector<std::string> urlList;
+};

client/gui/include/user.h

@@ -0,0 +1,44 @@
+#ifndef USER_H
+#define USER_H
+
+#include "tools/utils.h"
+
+class IUser {
+ public:
+    virtual void setId(int) = 0;
+    virtual void setName(std::string) = 0;
+    virtual void setEmail(std::string) = 0;
+    virtual void setPasswordHash(std::string) = 0;
+    virtual void setUrlList(std::vector<std::string>) = 0;
+
+    virtual int getId() const = 0;
+    virtual std::string getName() const = 0;
+    virtual std::string getEmail() const = 0;
+    virtual std::string getPasswordHash() const = 0;
+    virtual std::vector<std::string> getUrlList() const = 0;
+};
+
+class User : public IUser {
+ public:
+    void setId(int) override;
+    int getId() const override;
+
+    void setName(std::string) override;
+    std::string getName() const override;
+
+    void setEmail(std::string) override;
+    std::string getEmail() const override;
+
+    void setPasswordHash(std::string) override;
+    std::string getPasswordHash() const override;
+
+    void setUrlList(std::vector<std::string>) override;
+    std::vector<std::string> getUrlList() const override;
+
+ private:
+    int Id;
+    std::string name;
+    std::string password;
+    std::string email;
+};
+#endif  // _USER_H_

client/gui/include/windows/authorizer.h

@@ -0,0 +1,38 @@
+#ifndef AUTH_H
+#define AUTH_H
+
+#include "tools/utils.h"
+#include "include/user.h"
+
+#include <QWidget>
+#include <QPushButton>
+
+
+QT_BEGIN_NAMESPACE
+namespace Ui {
+    class Authorizer;
+}
+QT_END_NAMESPACE
+
+class IAuthorizer {
+    virtual void on_BtnAuth_clicked() = 0;
+    virtual void on_BtnCheckForm_clicked() = 0;
+    virtual void on_BtnBack_clicked() = 0;
+};
+
+class Authorizer : public QWidget, public IAuthorizer {
+    Q_OBJECT
+
+ public:
+    Widget(QWidget *parent = nullptr);
+    ~Widget();
+
+ private slots:
+    void on_BtnRun_clicked() const override;
+    void on_BtnConfig_clicked() const override;
+    void on_BtnChangeMode_clicked() const override;
+
+ private:
+    Ui::Widget *ui;
+};
+#endif  // AUTH_H

client/gui/include/windows/mainwindow.h

@@ -0,0 +1,37 @@
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include "tools/utils.h"
+
+#include <QMainWindow>
+
+#include "authorizer.h"
+#include "start_page.h"
+#include "url_configuration.h"
+#include "user_settings.h"
+
+
+QT_BEGIN_NAMESPACE
+namespace Ui { class MainWindow; }
+QT_END_NAMESPACE
+
+class MainWindow : public QMainWindow {
+    Q_OBJECT
+
+ public:
+    MainWindow(QWidget *parent = nullptr);
+    ~MainWindow();
+
+ public slots:
+    void drawWidget();
+    void closeWindow();
+    void cleanWindow();
+    void drawUser();
+
+ private slots:
+    void on_BtnUser_clicked();
+
+ private:
+    Ui::MainWindow *ui;
+};
+#endif  // MAINWINDOW_H

client/gui/include/windows/start_page.h

@@ -0,0 +1,38 @@
+#ifndef STARTPAGE_H
+#define STARTPAGE_H
+
+#include "../tools/utils.h"
+#include "include/user.h"
+
+#include <QWidget>
+#include <QPushButton>
+
+
+QT_BEGIN_NAMESPACE
+namespace Ui {
+    class StartPage;
+}
+QT_END_NAMESPACE
+
+class IStartPage {
+    virtual void on_BtnRun_clicked() = 0;
+    virtual void on_BtnConfig_clicked() = 0;
+    virtual void on_BtnChangeMode_clicked() = 0;
+};
+
+class StartPage : public QWidget, public IStartPage {
+    Q_OBJECT
+
+public:
+    Widget(QWidget *parent = nullptr);
+    ~Widget();
+
+private slots:
+    void on_BtnRun_clicked() const override;
+    void on_BtnConfig_clicked() const override;
+    void on_BtnChangeMode_clicked() const override;
+
+private:
+    Ui::Widget *ui;
+};
+#endif  // STARTPAGE_H