AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' into open-config-in-app

Browse source
This commit is contained in:
pokamest 2022-07-31 23:39:11 +03:00
commit 9f7b2de311
22 changed files with 96 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

6
client/client.pro
View file

@ -78,7 +78,7 @@ HEADERS += \
loghandler.h \ loghandler.h \
loglevel.h \ loglevel.h \
constants.h \ constants.h \
platforms/ios/QRCodeReader.h platforms/ios/QRCodeReaderBase.h
SOURCES += \ SOURCES += \
configurators/cloak_configurator.cpp \ configurators/cloak_configurator.cpp \
@ -132,7 +132,7 @@ SOURCES += \
protocols/vpnprotocol.cpp \ protocols/vpnprotocol.cpp \
logger.cpp \ logger.cpp \
loghandler.cpp \ loghandler.cpp \
platforms/ios/QRCodeReader.cpp platforms/ios/QRCodeReaderBase.cpp
RESOURCES += \ RESOURCES += \
resources.qrc resources.qrc
@ -317,7 +317,7 @@ ios {
platforms/ios/iosglue.mm \ platforms/ios/iosglue.mm \
platforms/ios/ipaddress.cpp \ platforms/ios/ipaddress.cpp \
platforms/ios/ipaddressrange.cpp \ platforms/ios/ipaddressrange.cpp \
platforms/ios/QRCodeReader.mm \ platforms/ios/QRCodeReaderBase.mm
platforms/ios/QtAppDelegate.mm \ platforms/ios/QtAppDelegate.mm \
platforms/ios/MobileUtils.mm platforms/ios/MobileUtils.mm

9
client/configurators/vpn_configurator.cpp
View file

@ -109,12 +109,9 @@ void VpnConfigurator::updateContainerConfigAfterInstallation(DockerContainer con
qDebug() << "amnezia-tor onions" << stdOut; qDebug() << "amnezia-tor onions" << stdOut;
QStringList l = stdOut.split(","); QString onion = stdOut;
for (QString s : l) { onion.replace("\n", "");
if (s.contains(":80")) { protocol.insert(config_key::site, onion);
protocol.insert(config_key::site, s);
}
}
containerConfig.insert(ProtocolProps::protoToString(mainProto), protocol); containerConfig.insert(ProtocolProps::protoToString(mainProto), protocol);
} }

4
client/containers/containers_defs.cpp
View file

@ -77,7 +77,7 @@ QMap<DockerContainer, QString> ContainerProps::containerHumanNames()
{DockerContainer::WireGuard, "WireGuard"}, {DockerContainer::WireGuard, "WireGuard"},
{DockerContainer::Ipsec, QObject::tr("IPsec")}, {DockerContainer::Ipsec, QObject::tr("IPsec")},
{DockerContainer::TorWebSite, QObject::tr("Web site in TOR network")}, {DockerContainer::TorWebSite, QObject::tr("Web site in Tor network")},
{DockerContainer::Dns, QObject::tr("DNS Service")}, {DockerContainer::Dns, QObject::tr("DNS Service")},
//{DockerContainer::FileShare, QObject::tr("SMB file sharing service")}, //{DockerContainer::FileShare, QObject::tr("SMB file sharing service")},
{DockerContainer::Sftp, QObject::tr("Sftp file sharing service")} {DockerContainer::Sftp, QObject::tr("Sftp file sharing service")}
@ -94,7 +94,7 @@ QMap<DockerContainer, QString> ContainerProps::containerDescriptions()
{DockerContainer::WireGuard, QObject::tr("WireGuard container")}, {DockerContainer::WireGuard, QObject::tr("WireGuard container")},
{DockerContainer::Ipsec, QObject::tr("IPsec container")}, {DockerContainer::Ipsec, QObject::tr("IPsec container")},
{DockerContainer::TorWebSite, QObject::tr("Web site in TOR network")}, {DockerContainer::TorWebSite, QObject::tr("Web site in Tor network")},
{DockerContainer::Dns, QObject::tr("DNS Service")}, {DockerContainer::Dns, QObject::tr("DNS Service")},
//{DockerContainer::FileShare, QObject::tr("SMB file sharing service - is Window file sharing protocol")}, //{DockerContainer::FileShare, QObject::tr("SMB file sharing service - is Window file sharing protocol")},
{DockerContainer::Sftp, QObject::tr("Sftp file sharing service - is secure FTP service")} {DockerContainer::Sftp, QObject::tr("Sftp file sharing service - is secure FTP service")}

2
client/main.cpp
View file

@ -37,7 +37,7 @@
#include "QZXing.h" #include "QZXing.h"
#include "platforms/ios/QRCodeReader.h" #include "platforms/ios/QRCodeReaderBase.h"
#include "debug.h" #include "debug.h"
#include "defines.h" #include "defines.h"

4
client/platforms/ios/QRCodeReader.cpp → client/platforms/ios/QRCodeReaderBase.cpp
View file

@ -1,4 +1,4 @@
#include "QRCodeReader.h" #include "QRCodeReaderBase.h"
QRCodeReader::QRCodeReader() QRCodeReader::QRCodeReader()
{ {
@ -11,4 +11,4 @@ QRect QRCodeReader::cameraSize() {
void QRCodeReader::startReading() {} void QRCodeReader::startReading() {}
void QRCodeReader::stopReading() {} void QRCodeReader::stopReading() {}
void QRCodeReader::setCameraSize(QRect) {}; void QRCodeReader::setCameraSize(QRect) {}

6
client/platforms/ios/QRCodeReader.h → client/platforms/ios/QRCodeReaderBase.h
View file

@ -1,5 +1,5 @@
#ifndef QRCODEREADER_H #ifndef QRCODEREADERBASE_H
#define QRCODEREADER_H #define QRCODEREADERBASE_H
#include <QObject> #include <QObject>
#include <QRect> #include <QRect>
@ -25,4 +25,4 @@ private:
QRect m_cameraSize; QRect m_cameraSize;
}; };
#endif // QRCODEREADER_H #endif // QRCODEREADERBASE_H

2
client/platforms/ios/QRCodeReader.mm → client/platforms/ios/QRCodeReaderBase.mm
View file

@ -1,4 +1,4 @@
#include "QRCodeReader.h" #include "QRCodeReaderBase.h"
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#import <AVFoundation/AVFoundation.h> #import <AVFoundation/AVFoundation.h>

2
client/protocols/protocols_defs.cpp
View file

@ -76,7 +76,7 @@ QMap<amnezia::Proto, QString> ProtocolProps::protocolHumanNames()
{Proto::Ikev2, "IKEv2"}, {Proto::Ikev2, "IKEv2"},
{Proto::L2tp, "L2TP"}, {Proto::L2tp, "L2TP"},
{Proto::TorWebSite, "Web site in TOR network"}, {Proto::TorWebSite, "Web site in Tor network"},
{Proto::Dns, "DNS Service"}, {Proto::Dns, "DNS Service"},
{Proto::FileShare, "File Sharing Service"}, {Proto::FileShare, "File Sharing Service"},
{Proto::Sftp, QObject::tr("Sftp service")} {Proto::Sftp, QObject::tr("Sftp service")}

1
client/resources.qrc
View file

@ -158,5 +158,6 @@
<file>images/svg/settings_suggest_black_24dp.svg</file> <file>images/svg/settings_suggest_black_24dp.svg</file>
<file>ui/qml/Controls/SvgButtonType.qml</file> <file>ui/qml/Controls/SvgButtonType.qml</file>
<file>ui/qml/Pages/PageQrDecoderIos.qml</file> <file>ui/qml/Pages/PageQrDecoderIos.qml</file>
<file>server_scripts/website_tor/Dockerfile</file>
</qresource> </qresource>
</RCC> </RCC>

7
client/server_scripts/dns/run_container.sh
View file

@ -1,2 +1,7 @@
# Run container # Run container
sudo docker run -d --restart always --network amnezia-dns-net --ip=172.29.172.254 --name $CONTAINER_NAME $CONTAINER_NAME sudo docker run -d \
--log-driver none \
--restart always \
--network amnezia-dns-net \
--ip=172.29.172.254 \
--name $CONTAINER_NAME $CONTAINER_NAME

13
client/server_scripts/ipsec/run_container.sh
View file

@ -1,8 +1,9 @@
sudo docker run \ sudo docker run -d \
--restart=always \ --privileged \
-p 500:500/udp \ --log-driver none \
-p 4500:4500/udp \ --restart=always \
-d --privileged \ -p 500:500/udp \
--name $CONTAINER_NAME $CONTAINER_NAME -p 4500:4500/udp \
--name $CONTAINER_NAME $CONTAINER_NAME
sudo docker network connect amnezia-dns-net $CONTAINER_NAME sudo docker network connect amnezia-dns-net $CONTAINER_NAME

11
client/server_scripts/openvpn/run_container.sh
View file

@ -1,9 +1,10 @@
# Run container # Run container
sudo docker run \ sudo docker run -d \
-d --restart always \ --log-driver none \
--cap-add=NET_ADMIN \ --restart always \
-p $OPENVPN_PORT:$OPENVPN_PORT/$OPENVPN_TRANSPORT_PROTO \ --cap-add=NET_ADMIN \
--name $CONTAINER_NAME $CONTAINER_NAME -p $OPENVPN_PORT:$OPENVPN_PORT/$OPENVPN_TRANSPORT_PROTO \
--name $CONTAINER_NAME $CONTAINER_NAME
sudo docker network connect amnezia-dns-net $CONTAINER_NAME sudo docker network connect amnezia-dns-net $CONTAINER_NAME

11
client/server_scripts/openvpn_cloak/run_container.sh
View file

@ -1,9 +1,10 @@
# Run container # Run container
sudo docker run \ sudo docker run -d \
-d --restart always \ --log-driver none \
--cap-add=NET_ADMIN \ --restart always \
-p $CLOAK_SERVER_PORT:443/tcp \ --cap-add=NET_ADMIN \
--name $CONTAINER_NAME $CONTAINER_NAME -p $CLOAK_SERVER_PORT:443/tcp \
--name $CONTAINER_NAME $CONTAINER_NAME
sudo docker network connect amnezia-dns-net $CONTAINER_NAME sudo docker network connect amnezia-dns-net $CONTAINER_NAME

1
client/server_scripts/openvpn_shadowsocks/run_container.sh
View file

@ -1,5 +1,6 @@
# Run container # Run container
sudo docker run \ sudo docker run \
--log-driver none \
-d --restart always \ -d --restart always \
--cap-add=NET_ADMIN \ --cap-add=NET_ADMIN \
-p $SHADOWSOCKS_SERVER_PORT:$SHADOWSOCKS_SERVER_PORT/tcp \ -p $SHADOWSOCKS_SERVER_PORT:$SHADOWSOCKS_SERVER_PORT/tcp \

8
client/server_scripts/sftp/run_container.sh
View file

@ -1 +1,7 @@
sudo docker run -d --restart always -p $SFTP_PORT:22/tcp --name $CONTAINER_NAME $CONTAINER_NAME $SFTP_USER:$SFTP_PASSWORD:::upload sudo docker run -d \
--log-driver none \
--restart always \
-p $SFTP_PORT:22/tcp \
--name $CONTAINER_NAME \
$CONTAINER_NAME \
$SFTP_USER:$SFTP_PASSWORD:::upload

3
client/server_scripts/website_tor/Dockerfile Normal file
View file

@ -0,0 +1,3 @@
FROM amneziavpn/torpress:latest
LABEL maintainer="AmneziaVPN"

2
client/server_scripts/website_tor/configure_container.sh
View file

@ -1,3 +1,3 @@
sleep 5 sleep 5
# get onions list # get onions list
onions cat /var/lib/tor/hidden_service/hostname

11
client/server_scripts/website_tor/run_container.sh
View file

@ -1,6 +1,5 @@
# Run container sudo docker run -d \
sudo docker stop amnezia-tor --log-driver none \
sudo docker rm amnezia-tor --restart always \
sudo docker run -d -p 80:80 --restart always --name $CONTAINER_NAME tutum/wordpress --name $CONTAINER_NAME \
sudo docker run -d --link $CONTAINER_NAME --name amnezia-tor goldy/tor-hidden-service $CONTAINER_NAME
sudo docker exec -i amnezia-tor apk add bash

1
client/server_scripts/wireguard/run_container.sh
View file

@ -1,5 +1,6 @@
# Run container # Run container
sudo docker run -d \ sudo docker run -d \
--log-driver none \
--restart always \ --restart always \
--privileged \ --privileged \
--cap-add=NET_ADMIN \ --cap-add=NET_ADMIN \

54
client/ui/qml/Pages/Protocols/PageProtoTorWebSite.qml
View file

@ -1,5 +1,6 @@
import QtQuick 2.12 import QtQuick 2.12
import QtQuick.Controls 2.12 import QtQuick.Controls 2.12
import QtQuick.Layouts 1.15
import ProtocolEnum 1.0 import ProtocolEnum 1.0
import "../" import "../"
import "../../Controls" import "../../Controls"
@ -16,43 +17,54 @@ PageProtocolBase {
Caption { Caption {
id: caption id: caption
text: qsTr("TOR Web site settings") text: qsTr("Tor Web Site settings")
} }
Rectangle {
id: frame_settings ColumnLayout {
width: parent.width id: content
enabled: logic.pageEnabled
anchors.top: caption.bottom anchors.top: caption.bottom
anchors.left: root.left
anchors.right: root.right
anchors.bottom: pb_save.top
anchors.margins: 20
anchors.topMargin: 10 anchors.topMargin: 10
border.width: 1
border.color: "lightgray"
anchors.bottomMargin: 5
anchors.horizontalCenter: parent.horizontalCenter
radius: 2
Grid {
id: grid
anchors.fill: parent
columns: 2
horizontalItemAlignment: Grid.AlignHCenter
verticalItemAlignment: Grid.AlignVCenter
topPadding: 5
leftPadding: 30
rightPadding: 30
spacing: 5
RowLayout {
Layout.fillWidth: true
LabelType { LabelType {
width: 130 id: lbl_onion
Layout.preferredWidth: 0.3 * root.width - 10
text: qsTr("Web site onion address") text: qsTr("Web site onion address")
} }
TextFieldType { TextFieldType {
id: tf_site_address id: tf_site_address
width: parent.width - 130 - parent.spacing - parent.leftPadding * 2 Layout.fillWidth: true
text: logic.labelTorWebSiteAddressText text: logic.labelTorWebSiteAddressText
readOnly: true readOnly: true
} }
}
ShareConnectionButtonCopyType {
Layout.fillWidth: true
Layout.topMargin: 5
copyText: tf_site_address.text
}
RichLabelType {
Layout.fillWidth: true
Layout.topMargin: 15
text: qsTr("Notes:<ul>
<li>Use <a href=\"https://www.torproject.org/download/\">Tor Browser</a> to open this url.</li>
<li>After installation it takes several minutes while your onion site will become available in the Tor Network.</li>
<li>When configuring WordPress set the domain as this onion address.</li>
</ul>
")
} }
} }
} }

2
client/ui/qml/Pages/Share/PageShareProtoTorWebSite.qml
View file

@ -15,6 +15,6 @@ PageShareProtocolBase {
Caption { Caption {
id: caption id: caption
text: qsTr("Share TOR Web site") text: qsTr("Share Tor Web site")
} }
} }

2
deploy/data/linux/post_install.sh
View file

@ -26,6 +26,8 @@ if sudo systemctl is-active --quiet $APP_NAME; then
fi fi
sudo chmod +x $APP_PATH/client/bin/easyrsa >> $LOG_FILE sudo chmod +x $APP_PATH/client/bin/easyrsa >> $LOG_FILE
sudo chmod --- $APP_PATH/client/bin/update-resolv-conf.sh
sudo chmod +rx $APP_PATH/client/bin/update-resolv-conf.sh
sudo cp $APP_PATH/service/$APP_NAME.service /etc/systemd/system/ >> $LOG_FILE sudo cp $APP_PATH/service/$APP_NAME.service /etc/systemd/system/ >> $LOG_FILE