diff --git a/sources/3rdparty/task/taskadds.cpp b/sources/3rdparty/task/taskadds.cpp index 7629c05..0116def 100644 --- a/sources/3rdparty/task/taskadds.cpp +++ b/sources/3rdparty/task/taskadds.cpp @@ -29,12 +29,14 @@ TaskResult runTask(const QString cmd, const bool useSuid) command.waitForFinished(-1); r.exitCode = command.exitCode(); r.output = command.readAllStandardOutput(); + r.error = command.readAllStandardError(); } else { QProcess command; command.start(cmd); command.waitForFinished(-1); r.exitCode = command.exitCode(); r.output = command.readAllStandardOutput(); + r.error = command.readAllStandardError(); } return r; diff --git a/sources/3rdparty/task/taskadds.h b/sources/3rdparty/task/taskadds.h index 8a49b1e..609fcba 100644 --- a/sources/3rdparty/task/taskadds.h +++ b/sources/3rdparty/task/taskadds.h @@ -38,6 +38,7 @@ protected: struct TaskResult { int exitCode; + QByteArray error; QByteArray output; }; TaskResult runTask(const QString cmd, const bool useSuid = true); diff --git a/sources/dataengine/netctl.conf b/sources/dataengine/netctl.conf index c744ea0..40aa930 100644 --- a/sources/dataengine/netctl.conf +++ b/sources/dataengine/netctl.conf @@ -2,15 +2,15 @@ ## Commands # command -CMD=/usr/bin/netctl +NETCTLCMD=/usr/bin/netctl # netctl-auto command NETCTLAUTOCMD=/usr/bin/netctl-auto ## External IP # external IPv4 check command -EXTIPCMD=curl ip4.telize.com +EXTIP4CMD=curl ip4.telize.com # 'true' - check external IPv4 -EXTIP=false +EXTIP4=false # external IPv6 check command EXTIP6CMD=curl ip6.telize.com # 'true' - check external IPv6 diff --git a/sources/gui/docs/CMakeLists.txt b/sources/gui/docs/CMakeLists.txt index 1569b7f..d9ec0f8 100644 --- a/sources/gui/docs/CMakeLists.txt +++ b/sources/gui/docs/CMakeLists.txt @@ -1,9 +1,12 @@ # build pages file (GLOB SUBPROJECT_DOCS_IN *.html) +file (GLOB SUBPROJECT_IMGS *.png) foreach (DOC_IN ${SUBPROJECT_DOCS_IN}) file (RELATIVE_PATH ONE_DOC ${CMAKE_SOURCE_DIR} ${DOC_IN}) configure_file (${DOC_IN} ${CMAKE_CURRENT_BINARY_DIR}/${ONE_DOC}) set (SUBPROJECT_DOCS ${SUBPROJECT_DOCS} ${CMAKE_CURRENT_BINARY_DIR}/${ONE_DOC}) endforeach () + install (FILES ${SUBPROJECT_DOCS} DESTINATION share/doc/${PROJECT_NAME}) +install (FILES ${SUBPROJECT_IMGS} DESTINATION share/doc/${PROJECT_NAME}) diff --git a/sources/gui/docs/architecture.png b/sources/gui/docs/architecture.png new file mode 100644 index 0000000..ef2424a Binary files /dev/null and b/sources/gui/docs/architecture.png differ diff --git a/sources/gui/docs/netctl-gui-security-notes.html b/sources/gui/docs/netctl-gui-security-notes.html index a715704..a76781e 100644 --- a/sources/gui/docs/netctl-gui-security-notes.html +++ b/sources/gui/docs/netctl-gui-security-notes.html @@ -8,11 +8,68 @@

netctl-gui security notes

Project version : @PROJECT_VERSION@

    +
  1. Description
    2. +
  2. Architecture
    3. +
  3. KDE components security
    4. +
  4. Graphical interface security
    5. +
  5. Library security
    6. +
  6. Helper security
    7. +
  7. External links
+

Description

+

+ +

Architecture

+architecture + +

KDE components security

+

There are two netctl-based commands which are run from the DataEngine

+ +

Both of them do not require any additional privileges normally. Also DataEngine has two other command which will be run from; they should define external IP. According to the idea that user can set any command to run, this module is not secure. But running commands will not do more than user can do from console himself.

+ +

The widget gets information from DataEngine, thus it does not require any additional permissions to show information. But netctl calls with root privileges are used to control netctl. In this case used commands are

+ +

All netctl-based commands requires root privileges and sudo (and any other alternatives) is used normally as prefix to the commands. The netctl-auto command does not require additional permissions.

+ +

The other way is to use DBus communication with the helper. In this case user should have rights to start the helper.

+ +

Graphical interface security

+

Graphical interface may interact with netctl over DBus (the helper) and over the library. Please refer to their notes to any additional information. If user uses helper he should have permissions to run it.

+ +

Library security

+

According to the scheme library gets information from netctl and can control it. Also it provides some additional functions such as a profile creation and removal and access to wpa_supplicant functions. Some function does not require additional permissions, but other ones do it. All dynamic arguments including profile names and paths are in double quotes to avoid white spaces problem. The functions which requires root privileges are:

+ +

External links