Skip to content

Support iprange while creating remote access vpn #12063

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DaanHoogland merged 1 commit into from
Dec 9, 2025
Merged

Support iprange while creating remote access vpn #12063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ui/public/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1879,6 +1879,7 @@
"label.release.dedicated.pod": "Release dedicated Pod",
"label.release.dedicated.zone": "Release dedicated Zone",
"label.releasing.ip": "Releasing IP",
"label.remote.access.vpn.specify.iprange": "Specify IP Range of remote VPN",
"label.remote.instances": "Remote Instances",
"label.remove": "Remove",
"label.remove.annotation": "Remove comment",
Expand Down Expand Up @@ -3055,6 +3056,7 @@
"message.enable.vpn.processing": "Enabling VPN...",
"message.enabled.vpn": "Your remote access VPN is currently enabled and can be accessed via the IP.",
"message.enabled.vpn.ip.sec": "Your IPSec pre-shared key is",
"message.enabled.vpn.ip.range": "Your VPN IP Range is",
"message.enabling.security.group.provider": "Enabling security group provider",
"message.enter.valid.nic.ip": "Please enter a valid IP address for NIC",
"message.error.access.key": "Please enter access key.",
Expand Down Expand Up @@ -3380,6 +3382,7 @@
"message.releasing.dedicated.host": "Releasing dedicated host...",
"message.releasing.dedicated.pod": "Releasing dedicated Pod...",
"message.releasing.dedicated.zone": "Releasing dedicated Zone...",
"message.remote.access.vpn.iprange.description": "The range of IP addresses to allocate to VPN clients. The first IP in the range will be taken by the VPN server. (Optional)",
"message.remove.annotation": "Are you sure you want to delete the comment?",
"message.remove.egress.rule.failed": "Removing egress rule failed",
"message.remove.egress.rule.processing": "Deleting egress rule...",
Expand Down
140 changes: 87 additions & 53 deletions ui/src/views/network/VpnDetails.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,71 +16,93 @@
// under the License.

<template>
<div v-if="remoteAccessVpn">
<div>
<p>{{ $t('message.enabled.vpn') }} <strong>{{ remoteAccessVpn.publicip }}</strong></p>
<p>{{ $t('message.enabled.vpn.ip.sec') }} <strong>{{ remoteAccessVpn.presharedkey }}</strong></p>
<a-divider/>
<a-button><router-link :to="{ path: '/vpnuser'}">{{ $t('label.manage.vpn.user') }}</router-link></a-button>
<a-button
style="margin-left: 10px"
type="primary"
danger
@click="disableVpn = true"
:disabled="!('deleteRemoteAccessVpn' in $store.getters.apis)">
{{ $t('label.disable.vpn') }}
</a-button>
</div>
<div class="vpn-details">
<div v-if="remoteAccessVpn">
<div>
<p>{{ $t('message.enabled.vpn') }} <strong>{{ remoteAccessVpn.publicip }}</strong></p>
<p>{{ $t('message.enabled.vpn.ip.sec') }} <strong>{{ remoteAccessVpn.presharedkey }}</strong></p>
<p>{{ $t('message.enabled.vpn.ip.range') }} <strong>{{ remoteAccessVpn.iprange }}</strong></p>
<a-divider/>
<a-button><router-link :to="{ path: '/vpnuser'}">{{ $t('label.manage.vpn.user') }}</router-link></a-button>
<a-button
style="margin-left: 10px"
type="primary"
danger
@click="disableVpn = true"
:disabled="!('deleteRemoteAccessVpn' in $store.getters.apis)">
{{ $t('label.disable.vpn') }}
</a-button>
</div>

<a-modal
:visible="disableVpn"
:footer="null"
:title="$t('label.disable.vpn')"
:closable="true"
:maskClosable="false"
@cancel="disableVpn = false">
<div v-ctrl-enter="handleDisableVpn">
<p>{{ $t('message.disable.vpn') }}</p>
<a-modal
:visible="disableVpn"
:footer="null"
:title="$t('label.disable.vpn')"
:closable="true"
:maskClosable="false"
@cancel="disableVpn = false">
<div v-ctrl-enter="handleDisableVpn">
<p>{{ $t('message.disable.vpn') }}</p>

<a-divider />
<a-divider />

<div class="actions">
<a-button @click="() => disableVpn = false">{{ $t('label.cancel') }}</a-button>
<a-button type="primary" @click="handleDisableVpn">{{ $t('label.yes') }}</a-button>
<div class="actions">
<a-button @click="() => disableVpn = false">{{ $t('label.cancel') }}</a-button>
<a-button type="primary" @click="handleDisableVpn">{{ $t('label.yes') }}</a-button>
</div>
</div>
</div>
</a-modal>
</a-modal>

</div>
<div v-else>
<a-button :disabled="!('createRemoteAccessVpn' in $store.getters.apis)" type="primary" @click="enableVpn = true">
{{ $t('label.enable.vpn') }}
</a-button>
</div>
<div v-else>
<a-button :disabled="!('createRemoteAccessVpn' in $store.getters.apis)" type="primary" @click="enableVpn = true">
{{ $t('label.enable.vpn') }}
</a-button>

<a-modal
:visible="enableVpn"
:footer="null"
:title="$t('label.enable.vpn')"
:maskClosable="false"
:closable="true"
@cancel="enableVpn = false">
<div v-ctrl-enter="handleCreateVpn">
<p>{{ $t('message.enable.vpn') }}</p>
<a-modal
:visible="enableVpn"
:footer="null"
:title="$t('label.enable.vpn')"
:maskClosable="false"
:closable="true"
@cancel="enableVpn = false">
<div v-ctrl-enter="handleCreateVpn">
<p>{{ $t('message.enable.vpn') }}</p>
<a-form-item>
<a-checkbox v-model:checked="specifyIpRange">
{{ $t('label.remote.access.vpn.specify.iprange') }}
</a-checkbox>
</a-form-item>
<a-form-item
v-if="specifyIpRange"
name="iprange"
:colon="false"
ref="iprange">
<template #label>
<tooltip-label :title="$t('label.ip.range')" :tooltip="$t('message.remote.access.vpn.iprange.description')"/>
</template>
<a-input
v-model:value="vpnIpRange"
:placeholder="'10.1.2.1-10.1.2.8'"
/>
</a-form-item>

<a-divider />
<a-divider />

<div class="actions">
<a-button @click="() => enableVpn = false">{{ $t('label.cancel') }}</a-button>
<a-button type="primary" ref="submit" @click="handleCreateVpn">{{ $t('label.yes') }}</a-button>
<div class="actions">
<a-button @click="() => enableVpn = false">{{ $t('label.cancel') }}</a-button>
<a-button type="primary" ref="submit" @click="handleCreateVpn">{{ $t('label.yes') }}</a-button>
</div>
</div>
</div>
</a-modal>
</a-modal>

</div>
</div>
</template>

<script>
import { api } from '@/api'
import TooltipLabel from '@/components/widgets/TooltipLabel'

export default {
props: {
Expand All @@ -89,12 +111,17 @@ export default {
required: true
}
},
components: {
TooltipLabel
},
data () {
return {
remoteAccessVpn: null,
enableVpn: false,
disableVpn: false,
isSubmitted: false
isSubmitted: false,
specifyIpRange: false,
vpnIpRange: ''
}
},
inject: ['parentFetchData', 'parentToggleLoading'],
Expand Down Expand Up @@ -130,11 +157,15 @@ export default {
this.isSubmitted = true
this.parentToggleLoading()
this.enableVpn = false
api('createRemoteAccessVpn', {
const params = {
publicipid: this.resource.id,
domainid: this.resource.domainid,
account: this.resource.account
}).then(response => {
}
if (this.specifyIpRange && this.vpnIpRange?.trim()) {
params.iprange = this.vpnIpRange.trim()
}
api('createRemoteAccessVpn', params).then(response => {
this.$pollJob({
jobId: response.createremoteaccessvpnresponse.jobid,
successMethod: result => {
Expand Down Expand Up @@ -227,4 +258,7 @@ export default {
}
}
}
.vpn-details {
padding: 8px 0;
}
</style>
Loading