Skip to content

Commit 06adf58

Browse files
NHASNHAS
committed
Add basic settings page
1 parent d155a95 commit 06adf58

File tree

11 files changed

+186
-40
lines changed

11 files changed

+186
-40
lines changed

‎adminui/settings.go

+14
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"net/http"
77

88
"github.com/NHAS/wag/internal/data"
9+
"github.com/NHAS/wag/internal/mfaportal/authenticators"
910
)
1011

1112
func (au *AdminUI) adminUsersData(w http.ResponseWriter, r *http.Request) {
@@ -89,3 +90,16 @@ func (au *AdminUI) updateLoginSettings(w http.ResponseWriter, r *http.Request) {
8990
return
9091
}
9192
}
93+
94+
func (au *AdminUI) getAllMfaMethods(w http.ResponseWriter, r *http.Request) {
95+
96+
resp := []MFAMethodDTO{}
97+
98+
authenticators := authenticators.GetAllAvaliableMethods()
99+
for _, a := range authenticators {
100+
resp = append(resp, MFAMethodDTO{FriendlyName: a.FriendlyName(), Method: a.Type()})
101+
}
102+
103+
w.Header().Set("content-type", "application/json")
104+
json.NewEncoder(w).Encode(resp)
105+
}

‎adminui/structs.go

+5
Original file line numberDiff line numberDiff line change
@@ -153,3 +153,8 @@ type EditDevicesDTO struct {
153153
Action string `json:"action"`
154154
Addresses []string `json:"addresses"`
155155
}
156+
157+
type MFAMethodDTO struct {
158+
FriendlyName string `json:"friendly_name"`
159+
Method string `json:"method"`
160+
}

‎adminui/ui_webserver.go

+1
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,7 @@ func New(firewall *router.Firewall, errs chan<- error) (ui *AdminUI, err error)
263263
protectedRoutes.HandleFunc("PUT /api/settings/login", adminUI.updateLoginSettings)
264264
protectedRoutes.HandleFunc("GET /api/settings/general", adminUI.getGeneralSettings)
265265
protectedRoutes.HandleFunc("GET /api/settings/login", adminUI.getLoginSettings)
266+
protectedRoutes.HandleFunc("GET /api/settings/all_mfa_methods", adminUI.getAllMfaMethods)
266267

267268
protectedRoutes.HandleFunc("GET /api/settings/management_users", adminUI.adminUsersData)
268269

‎adminui2/src/api/settings.ts

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { GenericResponseDTO, ChangePasswordRequestDTO, LoginSettingsResponseDTO, GeneralSettingsResponseDTO } from './types'
1+
import type { GenericResponseDTO, MFAMethodDTO, LoginSettingsResponseDTO, GeneralSettingsResponseDTO } from './types'
22

33
import { client } from '.'
44

@@ -16,4 +16,8 @@ export function getLoginSettings(): Promise<LoginSettingsResponseDTO> {
1616

1717
export function updateLoginSettings(settings: LoginSettingsResponseDTO): Promise<GenericResponseDTO> {
1818
return client.put('/api/settings/login', settings).then(res => res.data)
19-
}
19+
}
20+
21+
export function getMFAMethods(): Promise<MFAMethodDTO[]> {
22+
return client.get('/api/settings/all_mfa_methods').then(res => res.data)
23+
}

‎adminui2/src/api/types.ts

+8-2
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ export interface OidcResponseDTO {
150150
client_secret: string
151151
client_id: string
152152
group_claim_name: string
153-
DeviceUsernameClaim: string
153+
device_username_claim: string
154154
}
155155

156156

@@ -171,4 +171,10 @@ export interface LoginSettingsResponseDTO {
171171

172172
oidc: OidcResponseDTO
173173
pam: PamResponseDTO
174-
}
174+
}
175+
176+
177+
export interface MFAMethodDTO {
178+
friendly_name: string
179+
method: string
180+
}

‎adminui2/src/composables/useTextareaInput.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ref, computed } from 'vue'
1+
import { ref, computed, watch, type Ref } from 'vue'
22

33
export function useTextareaInput() {
44
const Input = ref('')

‎adminui2/src/pages/Dashboard.vue

+4-6
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,17 @@ import { useTokensStore } from '@/stores/registration_tokens'
99
import { useAuthStore } from '@/stores/auth'
1010
import { useInstanceDetailsStore } from '@/stores/serverInfo'
1111
12-
import { Icons } from '@/util/icons'
13-
1412
const devicesStore = useDevicesStore()
15-
devicesStore.load(true)
13+
devicesStore.load(false)
1614
1715
const registrationTokensStore = useTokensStore()
18-
registrationTokensStore.load(true)
16+
registrationTokensStore.load(false)
1917
2018
const instanceDetails = useInstanceDetailsStore()
21-
instanceDetails.load(false)
19+
instanceDetails.load(true)
2220
2321
const usersStore = useUsersStore()
24-
usersStore.load(true)
22+
usersStore.load(false)
2523
2624
const authStore = useAuthStore()
2725
const toast = useToast()

‎adminui2/src/pages/Settings.vue

+140-25
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
<script setup lang="ts">
22
import { storeToRefs } from 'pinia'
3-
import { ref, computed } from 'vue'
3+
import { ref, computed, watch } from 'vue'
44
import { useToast } from 'vue-toastification'
55
66
import { useToastError } from '@/composables/useToastError'
77
88
import { useAuthStore } from '@/stores/auth'
9-
import { useTextareaInput } from '@/composables/useTextareaInput'
10-
import { getGeneralSettings, getLoginSettings, updateGeneralSettings, updateLoginSettings, type GeneralSettingsResponseDTO as GeneralSettingsDTO, type LoginSettingsResponseDTO as LoginSettingsDTO } from '@/api'
9+
import { getMFAMethods, getGeneralSettings, getLoginSettings, updateGeneralSettings, updateLoginSettings, type GeneralSettingsResponseDTO as GeneralSettingsDTO, type LoginSettingsResponseDTO as LoginSettingsDTO } from '@/api'
1110
import { useApi } from '@/composables/useApi'
1211
import PageLoading from '@/components/PageLoading.vue'
1312
@@ -21,15 +20,24 @@ const { catcher } = useToastError()
2120
const { data: general, isLoading: isLoadingGeneralSettings, silentlyRefresh: refreshGeneral } = useApi(() => getGeneralSettings())
2221
const { data: loginSettings, isLoading: isLoadingLoginSettings, silentlyRefresh: refreshLoginSettings } = useApi(() => getLoginSettings())
2322
23+
const { data: mfaTypes, isLoading: isLoadingMFATypes } = useApi(() => getMFAMethods())
2424
2525
const generalData = computed(() => general.value ?? {} as GeneralSettingsDTO)
2626
const loginSettingsData = computed(() => loginSettings.value ?? {} as LoginSettingsDTO)
2727
28+
const textValue = ref(general.value?.dns.join('\n') ?? '')
2829
29-
const { Input: Dns, Arr: DnsArr } = useTextareaInput()
30-
31-
Dns.value = (general.value?.dns ?? []).join("\n")
30+
watch(textValue, (newValue) => {
31+
if (general.value) {
32+
general.value.dns = newValue.split('\n').filter(item => item.trim() !== '')
33+
}
34+
})
3235
36+
watch(general, (newValue) => {
37+
if (newValue) {
38+
textValue.value = newValue.dns.join('\n')
39+
}
40+
})
3341
3442
async function saveGeneralSettings() {
3543
try {
@@ -50,7 +58,7 @@ async function saveGeneralSettings() {
5058
async function saveLoginSettings() {
5159
try {
5260
const resp = await updateLoginSettings(loginSettingsData.value as LoginSettingsDTO)
53-
refreshGeneral()
61+
refreshLoginSettings()
5462
5563
if (!resp.success) {
5664
toast.error(resp.message ?? 'Failed')
@@ -68,13 +76,13 @@ async function saveLoginSettings() {
6876

6977
<template>
7078
<main class="w-full p-4">
71-
<PageLoading v-if="isLoadingGeneralSettings || isLoadingLoginSettings" />
79+
<PageLoading v-if="isLoadingGeneralSettings || isLoadingLoginSettings || isLoadingMFATypes" />
7280

7381
<div v-else>
7482
<h1 class="text-4xl font-bold">Settings</h1>
7583
<div class="mt-6 flex flex-wrap gap-6">
76-
<div class="flex w-full gap-4">
77-
<div class="card bg-base-100 shadow-xl min-w-[400px]">
84+
<div class="flex flex-wrap w-full gap-4">
85+
<div class="card bg-base-100 shadow-xl min-w-[350px]">
7886
<div class="card-body">
7987
<h2 class="card-title">General</h2>
8088

@@ -103,48 +111,155 @@ async function saveLoginSettings() {
103111
<div class="form-control">
104112
<label for="dns" class="block font-medium text-gray-900 pt-6">DNS</label>
105113
<textarea class="rules-input textarea textarea-bordered w-full font-mono" rows="3"
106-
v-model="Dns"></textarea>
114+
v-model="textValue"></textarea>
107115
</div>
108116

117+
<div class="flex flex-grow"></div>
109118

110-
<button type="submit" class="btn btn-primary w-full"
111-
@click="() => saveGeneralSettings()">
112-
<span class="loading loading-spinner loading-md" v-if="isLoadingGeneralSettings"></span>
113-
Save
114-
</button>
119+
<button type="submit" class="btn btn-primary w-full" @click="() => saveGeneralSettings()">
120+
<span class="loading loading-spinner loading-md" v-if="isLoadingGeneralSettings"></span>
121+
Save
122+
</button>
115123
</div>
116124
</div>
117-
<div class="card bg-base-100 shadow-xl min-w-[400px]">
125+
<div class="card bg-base-100 shadow-xl min-w-[350px]">
118126
<div class="card-body">
119127
<h2 class="card-title">Login</h2>
120128

121129
<div class="form-control">
122130
<label class="label font-bold">
123131
<span class="label-text">Session Life Time (Minutes)</span>
124132
</label>
125-
<input v-model="loginSettingsData.max_session_lifetime_minutes" type="number" class="input input-bordered w-full" />
133+
<input v-model="loginSettingsData.max_session_lifetime_minutes" type="number"
134+
class="input input-bordered w-full" />
126135
</div>
127136

128137
<div class="form-control">
129138
<label class="label font-bold">
130139
<span class="label-text">Inactivity Timeout (Minutes)</span>
131140
</label>
132-
<input v-model="loginSettingsData.session_inactivity_timeout_minutes" type="number" class="input input-bordered w-full" />
141+
<input v-model="loginSettingsData.session_inactivity_timeout_minutes" type="number"
142+
class="input input-bordered w-full" />
133143
</div>
134144

135145
<div class="form-control">
136146
<label class="label font-bold">
137147
<span class="label-text">Max Authentication Attempts</span>
138148
</label>
139-
<input v-model="loginSettingsData.lockout" type="number"
149+
<input v-model="loginSettingsData.lockout" type="number" class="input input-bordered w-full" />
150+
</div>
151+
152+
<div class="form-control w-full">
153+
<label for="default_method" class="label font-bold">Default MFA Method</label>
154+
<select class="select select-bordered " name="default_method"
155+
v-model="loginSettingsData.default_mfa_method">
156+
<option v-for="method in loginSettingsData.enabled_mfa_methods"
157+
:selected="method == loginSettingsData.default_mfa_method" :value="method">{{ method }}</option>
158+
</select>
159+
</div>
160+
161+
<div class="flex flex-col">
162+
<div v-for="method in mfaTypes" class="form-control w-full">
163+
<label :for=method.method class="label cursor-pointer">
164+
<span class="label-text">{{ method.friendly_name }}</span>
165+
<input :name=method.method type="checkbox" class="toggle toggle-primary" :value="method.method"
166+
v-model="loginSettingsData.enabled_mfa_methods"
167+
:checked="loginSettingsData.enabled_mfa_methods.indexOf(method.method) != -1" />
168+
</label>
169+
</div>
170+
</div>
171+
172+
<div class="flex flex-grow"></div>
173+
174+
<button type="submit" class="btn btn-primary w-full" @click="() => saveLoginSettings()">
175+
<span class="loading loading-spinner loading-md" v-if="isLoadingLoginSettings"></span>
176+
Save
177+
</button>
178+
</div>
179+
</div>
180+
181+
<div>
182+
<div
183+
v-if="loginSettingsData.enabled_mfa_methods.indexOf('totp') != -1 || loginSettingsData.enabled_mfa_methods.indexOf('webauthn') != -1"
184+
class="card bg-base-100 shadow-xl min-w-[350px] h-max mb-4">
185+
<div class="card-body">
186+
<h2 class="card-title">Login > General</h2>
187+
188+
<div class="form-control">
189+
<label class="label font-bold">
190+
<span class="label-text">Issuer</span>
191+
</label>
192+
<input v-model="loginSettingsData.issuer" type="text" required class="input input-bordered w-full" />
193+
</div>
194+
<div class="form-control">
195+
<label class="label font-bold">
196+
<span class="label-text">Internal VPN Domain</span>
197+
</label>
198+
<input v-model="loginSettingsData.domain" type="text" required class="input input-bordered w-full" />
199+
</div>
200+
</div>
201+
</div>
202+
203+
<div v-if="loginSettingsData.enabled_mfa_methods.indexOf('pam') != -1"
204+
class="card bg-base-100 shadow-xl min-w-[350px] h-max">
205+
<div class="card-body">
206+
<h2 class="card-title">Login > System Login</h2>
207+
208+
<div class="form-control">
209+
<label class="label font-bold">
210+
<span class="label-text">Service Name</span>
211+
</label>
212+
<input v-model="loginSettingsData.pam.service_name" type="text" required
213+
class="input input-bordered w-full" />
214+
</div>
215+
</div>
216+
</div>
217+
</div>
218+
219+
<div v-if="loginSettingsData.enabled_mfa_methods.indexOf('oidc') != -1"
220+
class="card bg-base-100 shadow-xl min-w-[350px] h-max">
221+
<div class="card-body">
222+
<h2 class="card-title">Login > SSO Settings</h2>
223+
224+
<div class="form-control">
225+
<label class="label font-bold">
226+
<span class="label-text">Provider URL</span>
227+
</label>
228+
<input v-model="loginSettingsData.oidc.issuer" type="text" required
229+
class="input input-bordered w-full" />
230+
</div>
231+
232+
<div class="form-control">
233+
<label class="label font-bold">
234+
<span class="label-text">Client ID</span>
235+
</label>
236+
<input v-model="loginSettingsData.oidc.client_id" type="text" required
237+
class="input input-bordered w-full" />
238+
</div>
239+
240+
<div class="form-control">
241+
<label class="label font-bold">
242+
<span class="label-text">Client Secret</span>
243+
</label>
244+
<input v-model="loginSettingsData.oidc.client_secret" type="password" required
140245
class="input input-bordered w-full" />
141246
</div>
142247

143-
<button type="submit" class="btn btn-primary w-full"
144-
@click="() => saveLoginSettings()">
145-
<span class="loading loading-spinner loading-md" v-if="isLoadingLoginSettings"></span>
146-
Save
147-
</button>
248+
<div class="form-control">
249+
<label class="label font-bold">
250+
<span class="label-text">Groups Claim Name</span>
251+
</label>
252+
<input v-model="loginSettingsData.oidc.group_claim_name" type="text"
253+
class="input input-bordered w-full" />
254+
</div>
255+
256+
<div class="form-control">
257+
<label class="label font-bold">
258+
<span class="label-text">Device Username Claim</span>
259+
</label>
260+
<input v-model="loginSettingsData.oidc.device_username_claim" type="text"
261+
class="input input-bordered w-full" />
262+
</div>
148263
</div>
149264
</div>
150265
</div>

‎internal/data/config.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,10 @@ func GetWebauthn() (wba Webauthn, err error) {
142142
}
143143

144144
var urlData string
145+
// Issuer
145146
json.Unmarshal(response.Responses[0].GetResponseRange().Kvs[0].Value, &wba.DisplayName)
147+
148+
//Domain
146149
json.Unmarshal(response.Responses[1].GetResponseRange().Kvs[0].Value, &urlData)
147150

148151
tunnelURL, err := url.Parse(urlData)
@@ -187,7 +190,7 @@ func SetAuthenticationMethods(methods []string) error {
187190
return err
188191
}
189192

190-
func GetAuthenicationMethods() (result []string, err error) {
193+
func GetEnabledAuthenicationMethods() (result []string, err error) {
191194

192195
resp, err := etcd.Get(context.Background(), MFAMethodsEnabledKey)
193196
if err != nil {

‎internal/mfaportal/authenticators/authenticators.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ func AddMFARoutes(mux *http.ServeMux, firewall *router.Firewall) error {
141141

142142
}
143143

144-
enabledMethods, err := data.GetAuthenicationMethods()
144+
enabledMethods, err := data.GetEnabledAuthenicationMethods()
145145
if err != nil {
146146
return err
147147
}

‎internal/mfaportal/statemachine.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func (mp *MfaPortal) oidcChanges(_ string, _ data.OIDC, _ data.OIDC, et data.Eve
5757
authenticators.DisableMethods(types.Oidc)
5858
case data.CREATED, data.MODIFIED:
5959
// Oidc and other mfa methods pull data from the etcd store themselves. So as dirty as this seems, its really just a notification to reinitialise themselves
60-
methods, err := data.GetAuthenicationMethods()
60+
methods, err := data.GetEnabledAuthenicationMethods()
6161
if err != nil {
6262
log.Println("Couldnt get authenication methods to enable oidc: ", err)
6363
return err
@@ -78,7 +78,7 @@ func (mp *MfaPortal) domainChanged(_ string, _ string, _ string, et data.EventTy
7878
switch et {
7979
case data.MODIFIED:
8080

81-
methods, err := data.GetAuthenicationMethods()
81+
methods, err := data.GetEnabledAuthenicationMethods()
8282
if err != nil {
8383
log.Println("Couldnt get authenication methods to enable oidc: ", err)
8484
return err

0 commit comments

Comments
 (0)