[PR #762] [MERGED] added ui for proxy container #2093

Closed
opened 2026-10-13 21:18:28 +00:00 by bsakaguchi · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/amnezia-vpn/amnezia-client/pull/762
Author: @Nethius
Created: 4/19/2024
Status: ✅ Merged
Merged: 6/10/2024
Merged by: @pokamest

Base: dev ← Head: feature/proxy-container


📝 Commits (10+)

  • 8c1ae96 added ui for proxy container
  • f8760c9 added sock5 proxy installing scripts
  • b1fd65e added ability to change port for socks5 container
  • d5bf7ef added 3proxy docker image
  • fac1d25 Merge branch 'dev' of github.com:amnezia-vpn/amnezia-client into feature/proxy-container
  • 82208ab Merge branch 'dev' of github.com:amnezia-vpn/amnezia-client into feature/proxy-container
  • b93641c moved socks5 settings editing to drawer
  • 292786d Merge branch 'dev' of github.com:amnezia-vpn/amnezia-client into feature/proxy-container
  • fbe3c9d added password, user and random port generation for the proxy container
  • af2f06d added port validity checks

📊 Changes

22 files changed (+633 additions, -11 deletions)

View changed files

📝 client/amnezia_application.cpp (+3 -0)
📝 client/amnezia_application.h (+2 -0)
📝 client/containers/containers_defs.cpp (+11 -3)
📝 client/containers/containers_defs.h (+2 -1)
📝 client/core/controllers/serverController.cpp (+14 -1)
📝 client/core/scripts_registry.cpp (+1 -0)
📝 client/protocols/protocols_defs.cpp (+8 -1)
📝 client/protocols/protocols_defs.h (+11 -1)
📝 client/resources.qrc (+6 -1)
➕ client/server_scripts/socks5_proxy/Dockerfile (+10 -0)
➕ client/server_scripts/socks5_proxy/configure_container.sh (+12 -0)
➕ client/server_scripts/socks5_proxy/run_container.sh (+5 -0)
➕ client/server_scripts/socks5_proxy/start.sh (+7 -0)
📝 client/ui/controllers/installController.cpp (+22 -1)
📝 client/ui/controllers/pageController.h (+1 -0)
📝 client/ui/models/protocols_model.cpp (+1 -0)
📝 client/ui/models/servers_model.cpp (+2 -0)
➕ client/ui/models/services/socks5ProxyConfigModel.cpp (+80 -0)
➕ client/ui/models/services/socks5ProxyConfigModel.h (+40 -0)
➕ client/ui/qml/Pages2/PageServiceSocksProxySettings.qml (+385 -0)

...and 2 more files

📄 Description

No description provided


🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/amnezia-vpn/amnezia-client/pull/762 **Author:** [@Nethius](https://github.com/Nethius) **Created:** 4/19/2024 **Status:** ✅ Merged **Merged:** 6/10/2024 **Merged by:** [@pokamest](https://github.com/pokamest) **Base:** `dev` ← **Head:** `feature/proxy-container` --- ### 📝 Commits (10+) - [`8c1ae96`](https://github.com/amnezia-vpn/amnezia-client/commit/8c1ae965c9280b772f1bb35d2d211569edccc51e) added ui for proxy container - [`f8760c9`](https://github.com/amnezia-vpn/amnezia-client/commit/f8760c9d8b6af543fd693c8216430c5c4d4f99a6) added sock5 proxy installing scripts - [`b1fd65e`](https://github.com/amnezia-vpn/amnezia-client/commit/b1fd65ec149b158e3c9d6950ac8fb014e6b6f475) added ability to change port for socks5 container - [`d5bf7ef`](https://github.com/amnezia-vpn/amnezia-client/commit/d5bf7ef15ec32fc300403a03518691821a96834f) added 3proxy docker image - [`fac1d25`](https://github.com/amnezia-vpn/amnezia-client/commit/fac1d259e7c68b4e935fe73a0246fdc169258989) Merge branch 'dev' of github.com:amnezia-vpn/amnezia-client into feature/proxy-container - [`82208ab`](https://github.com/amnezia-vpn/amnezia-client/commit/82208abea76a0eb03e94f3c0c6c4f9268663098b) Merge branch 'dev' of github.com:amnezia-vpn/amnezia-client into feature/proxy-container - [`b93641c`](https://github.com/amnezia-vpn/amnezia-client/commit/b93641c802f308dd0d07febb06ec5c91dcfaeee7) moved socks5 settings editing to drawer - [`292786d`](https://github.com/amnezia-vpn/amnezia-client/commit/292786d8e2cdb9e0954d0b1c9edbde5659e4a8c7) Merge branch 'dev' of github.com:amnezia-vpn/amnezia-client into feature/proxy-container - [`fbe3c9d`](https://github.com/amnezia-vpn/amnezia-client/commit/fbe3c9dbc4e9f94476f9d5ef58327b2a9e99ad24) added password, user and random port generation for the proxy container - [`af2f06d`](https://github.com/amnezia-vpn/amnezia-client/commit/af2f06d21678f10e72dd7f8f6f7e0a87cda55515) added port validity checks ### 📊 Changes **22 files changed** (+633 additions, -11 deletions) <details> <summary>View changed files</summary> 📝 `client/amnezia_application.cpp` (+3 -0) 📝 `client/amnezia_application.h` (+2 -0) 📝 `client/containers/containers_defs.cpp` (+11 -3) 📝 `client/containers/containers_defs.h` (+2 -1) 📝 `client/core/controllers/serverController.cpp` (+14 -1) 📝 `client/core/scripts_registry.cpp` (+1 -0) 📝 `client/protocols/protocols_defs.cpp` (+8 -1) 📝 `client/protocols/protocols_defs.h` (+11 -1) 📝 `client/resources.qrc` (+6 -1) ➕ `client/server_scripts/socks5_proxy/Dockerfile` (+10 -0) ➕ `client/server_scripts/socks5_proxy/configure_container.sh` (+12 -0) ➕ `client/server_scripts/socks5_proxy/run_container.sh` (+5 -0) ➕ `client/server_scripts/socks5_proxy/start.sh` (+7 -0) 📝 `client/ui/controllers/installController.cpp` (+22 -1) 📝 `client/ui/controllers/pageController.h` (+1 -0) 📝 `client/ui/models/protocols_model.cpp` (+1 -0) 📝 `client/ui/models/servers_model.cpp` (+2 -0) ➕ `client/ui/models/services/socks5ProxyConfigModel.cpp` (+80 -0) ➕ `client/ui/models/services/socks5ProxyConfigModel.h` (+40 -0) ➕ `client/ui/qml/Pages2/PageServiceSocksProxySettings.qml` (+385 -0) _...and 2 more files_ </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
bsakaguchi 2026-10-13 21:18:28 +00:00
Sign in to join this conversation.
No labels
pull-request
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
amnezia-vpn/amnezia-client#2093
No description provided.