Skip to content

Commit

Permalink
added IKEv2/IPSec, OpenConnect. MyVPN Agent fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
my0419 committed Oct 22, 2023
1 parent fff8db3 commit 6320009
Show file tree
Hide file tree
Showing 26 changed files with 294 additions and 160 deletions.
15 changes: 8 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ https://tool.myvpn.run
### Preview

![Screenshot](preview.png)
![Screenshot](preview2.png)

### Stack

Expand All @@ -34,12 +33,14 @@ https://tool.myvpn.run

### VPN protocols

* L2TP
* PPTP
* OpenVPN
* [WireGuard](https://www.wireguard.com/)
* Shadowsocks (with optional V2Ray Plugin)
* SOCKS5
1. L2TP/IPSec
2. IKEv2/IPSec
3. OpenConnect
4. PPTP
5. OpenVPN
6. [WireGuard](https://www.wireguard.com/)
7. Shadowsocks (Support V2Ray Plugin)
8. SOCKS5

### Other Software

Expand Down
4 changes: 0 additions & 4 deletions build.sh

This file was deleted.

102 changes: 37 additions & 65 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 8 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "myvpn",
"version": "0.5.2",
"description": "MyVPN - VPN for myself",
"version": "0.5.3",
"description": "MyVPN - Create your own personal VPN server ",
"author": {
"name": "MyVPN",
"email": "support@myvpn.run"
Expand All @@ -19,7 +19,7 @@
"cordova:build-android": "cross-env CORDOVA_PLATFORM=android vue-cli-service cordova-build-android",
"cordova:prepare": "vue-cli-service cordova-prepare",
"cordova:serve-android": "cross-env CORDOVA_PLATFORM=android vue-cli-service cordova-serve-android",
"dev": "vue-cli-service electron:serve",
"dev": "HOST=127.0.0.1 vue-cli-service electron:serve",
"dev:android": "npm run cordova:serve-android --debug",
"dev:android-release": "npm run cordova:serve-android --release -- --buildConfig",
"dev:web": "cross-env VUE_APP_WEB=true vue-cli-service serve",
Expand All @@ -41,7 +41,6 @@
"moment": "^2.29.4",
"qrcode.vue": "^1.7.0",
"register-service-worker": "^1.7.2",
"ssh2": "^0.8.9",
"v-clipboard": "^2.2.3",
"v-offline": "2.3.0",
"vue": "2.6.14",
Expand Down Expand Up @@ -75,6 +74,7 @@
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-vue": "^8.0.3",
"node-loader": "^2.0.0",
"node-polyfill-webpack-plugin": "^2.0.1",
"postcss-loader": "^7.0.1",
"prettier": "^2.4.1",
Expand Down Expand Up @@ -145,5 +145,9 @@
},
"resolutions": {
"vue-cli-plugin-electron-builder/electron-builder": "^23.0.3"
},
"repository": {
"type": "git",
"url": "https://github.com/my0419/myvpn-desktop.git"
}
}
Binary file modified preview.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed preview2.png
Binary file not shown.
2 changes: 1 addition & 1 deletion src/background.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ async function createWindow() {
// Create the browser window.
const win = new BrowserWindow({
width: isDevelopment ? 1400 : 968,
height: 654,
height: 730,
frame: false,
webPreferences: {
// Use pluginOptions.nodeIntegration, leave this alone
Expand Down
18 changes: 16 additions & 2 deletions src/components/ModalAdvancedSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,20 @@
</el-form-item>
</el-form>

<el-form v-if="protocol === 'ikev2'" ref="form">
<h3>IKEv2/IPSec</h3>
<el-form-item :label="this.$root.$t('Accounts')">
<el-input-number v-model="numberOfAccounts" :min="1" :max="5"></el-input-number>
</el-form-item>
</el-form>

<el-form v-if="protocol === 'openconnect'" ref="form">
<h3>{{ protocol }}</h3>
<el-form-item :label="this.$root.$t('Accounts')">
<el-input-number v-model="numberOfAccounts" :min="1" :max="5"></el-input-number>
</el-form-item>
</el-form>

<el-form v-if="protocol === 'socks5'" ref="form">
<h3>{{ protocol }}</h3>
<el-form-item :label="this.$root.$t('Port')">
Expand Down Expand Up @@ -232,8 +246,8 @@ export default {
info.push(this.$root.$t('Email'))
}
if (['shadowsocks', 'wireguard'].includes(this.protocol)) {
info.push(`${this.$root.$t('Accounts')}:${this.numberOfAccounts}`)
if (['shadowsocks', 'wireguard', 'ikev2', 'openconnect'].includes(this.protocol)) {
info.push(`${this.$root.$t('Accounts')}: ${this.numberOfAccounts}`)
}
if (this.protocol === 'nextcloud') {
Expand Down
2 changes: 1 addition & 1 deletion src/components/ProviderSelf.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div>
<h3 class="title">{{ $t('Setup SSH Connection') }}</h3>
<div class="notice">
<i class="el-icon-warning"></i> {{ $t('Requires a clean Debian 11 server') }}
<i class="el-icon-warning"></i> {{ $t('Requires a clean Debian 12 server') }}
</div>
<el-form :inline="true" class="provider-self-form">
<el-form-item :label="$t('User')">
Expand Down
Loading

0 comments on commit 6320009

Please sign in to comment.