diff --git a/client/components/app/ConfigSideNav.vue b/client/components/app/ConfigSideNav.vue index 32e7e694a..50fa7a06f 100644 --- a/client/components/app/ConfigSideNav.vue +++ b/client/components/app/ConfigSideNav.vue @@ -70,11 +70,6 @@ export default { title: this.$strings.HeaderUsers, path: '/config/users' }, - { - id: 'config-api-keys', - title: this.$strings.HeaderApiKeys, - path: '/config/api-keys' - }, { id: 'config-sessions', title: this.$strings.HeaderListeningSessions, diff --git a/client/components/app/LazyBookshelf.vue b/client/components/app/LazyBookshelf.vue index 854b61b24..61331fb9e 100644 --- a/client/components/app/LazyBookshelf.vue +++ b/client/components/app/LazyBookshelf.vue @@ -778,6 +778,10 @@ export default { windowResize() { this.executeRebuild() }, + socketInit() { + // Server settings are set on socket init + this.executeRebuild() + }, initListeners() { window.addEventListener('resize', this.windowResize) @@ -790,6 +794,7 @@ export default { }) this.$eventBus.$on('bookshelf_clear_selection', this.clearSelectedEntities) + this.$eventBus.$on('socket_init', this.socketInit) this.$eventBus.$on('user-settings', this.settingsUpdated) if (this.$root.socket) { @@ -821,6 +826,7 @@ export default { } this.$eventBus.$off('bookshelf_clear_selection', this.clearSelectedEntities) + this.$eventBus.$off('socket_init', this.socketInit) this.$eventBus.$off('user-settings', this.settingsUpdated) if (this.$root.socket) { diff --git a/client/components/cards/AuthorCard.vue b/client/components/cards/AuthorCard.vue index 053473934..82645c570 100644 --- a/client/components/cards/AuthorCard.vue +++ b/client/components/cards/AuthorCard.vue @@ -71,6 +71,9 @@ export default { coverHeight() { return this.cardHeight }, + userToken() { + return this.store.getters['user/getToken'] + }, _author() { return this.author || {} }, diff --git a/client/components/covers/AuthorImage.vue b/client/components/covers/AuthorImage.vue index 084492b0c..e320e552e 100644 --- a/client/components/covers/AuthorImage.vue +++ b/client/components/covers/AuthorImage.vue @@ -39,6 +39,9 @@ export default { } }, computed: { + userToken() { + return this.$store.getters['user/getToken'] + }, _author() { return this.author || {} }, diff --git a/client/components/modals/AccountModal.vue b/client/components/modals/AccountModal.vue index 6f4b7b674..71ac81550 100644 --- a/client/components/modals/AccountModal.vue +++ b/client/components/modals/AccountModal.vue @@ -309,9 +309,9 @@ export default { } else { console.log('Account updated', data.user) - if (data.user.id === this.user.id && data.user.accessToken !== this.user.accessToken) { - console.log('Current user access token was updated') - this.$store.commit('user/setAccessToken', data.user.accessToken) + if (data.user.id === this.user.id && data.user.token !== this.user.token) { + console.log('Current user token was updated') + this.$store.commit('user/setUserToken', data.user.token) } this.$toast.success(this.$strings.ToastAccountUpdateSuccess) @@ -351,6 +351,9 @@ export default { this.$toast.error(errMsg || 'Failed to create account') }) }, + toggleActive() { + this.newUser.isActive = !this.newUser.isActive + }, userTypeUpdated(type) { this.newUser.permissions = { download: type !== 'guest', diff --git a/client/components/modals/ApiKeyCreatedModal.vue b/client/components/modals/ApiKeyCreatedModal.vue deleted file mode 100644 index 96442a17f..000000000 --- a/client/components/modals/ApiKeyCreatedModal.vue +++ /dev/null @@ -1,60 +0,0 @@ - - - diff --git a/client/components/modals/ApiKeyModal.vue b/client/components/modals/ApiKeyModal.vue deleted file mode 100644 index b347abd00..000000000 --- a/client/components/modals/ApiKeyModal.vue +++ /dev/null @@ -1,198 +0,0 @@ - - - diff --git a/client/components/modals/Modal.vue b/client/components/modals/Modal.vue index 31ea1e610..a7d9c0ae2 100644 --- a/client/components/modals/Modal.vue +++ b/client/components/modals/Modal.vue @@ -23,7 +23,7 @@ export default { processing: Boolean, persistent: { type: Boolean, - default: false + default: true }, width: { type: [String, Number], @@ -99,7 +99,7 @@ export default { this.preventClickoutside = false return } - if (this.processing || this.persistent) return + if (this.processing && this.persistent) return if (ev.srcElement && ev.srcElement.classList.contains('modal-bg')) { this.show = false } diff --git a/client/components/modals/item/tabs/Files.vue b/client/components/modals/item/tabs/Files.vue index 15c442619..7be286fef 100644 --- a/client/components/modals/item/tabs/Files.vue +++ b/client/components/modals/item/tabs/Files.vue @@ -29,6 +29,9 @@ export default { media() { return this.libraryItem.media || {} }, + userToken() { + return this.$store.getters['user/getToken'] + }, userCanUpdate() { return this.$store.getters['user/getUserCanUpdate'] }, diff --git a/client/components/player/PlayerUi.vue b/client/components/player/PlayerUi.vue index f929943c4..82d535528 100644 --- a/client/components/player/PlayerUi.vue +++ b/client/components/player/PlayerUi.vue @@ -129,6 +129,9 @@ export default { return `${hoursRounded}h` } }, + token() { + return this.$store.getters['user/getToken'] + }, timeRemaining() { if (this.useChapterTrack && this.currentChapter) { var currChapTime = this.currentTime - this.currentChapter.start diff --git a/client/components/readers/ComicReader.vue b/client/components/readers/ComicReader.vue index fce269396..28d79bf2a 100644 --- a/client/components/readers/ComicReader.vue +++ b/client/components/readers/ComicReader.vue @@ -104,6 +104,9 @@ export default { } }, computed: { + userToken() { + return this.$store.getters['user/getToken'] + }, libraryItemId() { return this.libraryItem?.id }, @@ -231,7 +234,10 @@ export default { async extract() { this.loading = true var buff = await this.$axios.$get(this.ebookUrl, { - responseType: 'blob' + responseType: 'blob', + headers: { + Authorization: `Bearer ${this.userToken}` + } }) const archive = await Archive.open(buff) const originalFilesObject = await archive.getFilesObject() diff --git a/client/components/readers/EpubReader.vue b/client/components/readers/EpubReader.vue index ac8e3397a..350d8596c 100644 --- a/client/components/readers/EpubReader.vue +++ b/client/components/readers/EpubReader.vue @@ -57,6 +57,9 @@ export default { } }, computed: { + userToken() { + return this.$store.getters['user/getToken'] + }, /** @returns {string} */ libraryItemId() { return this.libraryItem?.id @@ -94,9 +97,9 @@ export default { }, ebookUrl() { if (this.fileId) { - return `/api/items/${this.libraryItemId}/ebook/${this.fileId}` + return `${this.$config.routerBasePath}/api/items/${this.libraryItemId}/ebook/${this.fileId}` } - return `/api/items/${this.libraryItemId}/ebook` + return `${this.$config.routerBasePath}/api/items/${this.libraryItemId}/ebook` }, themeRules() { const isDark = this.ereaderSettings.theme === 'dark' @@ -306,24 +309,14 @@ export default { /** @type {EpubReader} */ const reader = this - // Use axios to make request because we have token refresh logic in interceptor - const customRequest = async (url) => { - try { - return this.$axios.$get(url, { - responseType: 'arraybuffer' - }) - } catch (error) { - console.error('EpubReader.initEpub customRequest failed:', error) - throw error - } - } - /** @type {ePub.Book} */ reader.book = new ePub(reader.ebookUrl, { width: this.readerWidth, height: this.readerHeight - 50, openAs: 'epub', - requestMethod: customRequest + requestHeaders: { + Authorization: `Bearer ${this.userToken}` + } }) /** @type {ePub.Rendition} */ @@ -344,33 +337,29 @@ export default { this.applyTheme() }) - reader.book.ready - .then(() => { - // set up event listeners - reader.rendition.on('relocated', reader.relocated) - reader.rendition.on('keydown', reader.keyUp) + reader.book.ready.then(() => { + // set up event listeners + reader.rendition.on('relocated', reader.relocated) + reader.rendition.on('keydown', reader.keyUp) - reader.rendition.on('touchstart', (event) => { - this.$emit('touchstart', event) - }) - reader.rendition.on('touchend', (event) => { - this.$emit('touchend', event) - }) + reader.rendition.on('touchstart', (event) => { + this.$emit('touchstart', event) + }) + reader.rendition.on('touchend', (event) => { + this.$emit('touchend', event) + }) - // load ebook cfi locations - const savedLocations = this.loadLocations() - if (savedLocations) { - reader.book.locations.load(savedLocations) - } else { - reader.book.locations.generate().then(() => { - this.checkSaveLocations(reader.book.locations.save()) - }) - } - this.getChapters() - }) - .catch((error) => { - console.error('EpubReader.initEpub failed:', error) - }) + // load ebook cfi locations + const savedLocations = this.loadLocations() + if (savedLocations) { + reader.book.locations.load(savedLocations) + } else { + reader.book.locations.generate().then(() => { + this.checkSaveLocations(reader.book.locations.save()) + }) + } + this.getChapters() + }) }, getChapters() { // Load the list of chapters in the book. See https://github.com/futurepress/epub.js/issues/759 diff --git a/client/components/readers/MobiReader.vue b/client/components/readers/MobiReader.vue index 459ae55bf..3e784f775 100644 --- a/client/components/readers/MobiReader.vue +++ b/client/components/readers/MobiReader.vue @@ -26,6 +26,9 @@ export default { return {} }, computed: { + userToken() { + return this.$store.getters['user/getToken'] + }, libraryItemId() { return this.libraryItem?.id }, @@ -93,8 +96,11 @@ export default { }, async initMobi() { // Fetch mobi file as blob - const buff = await this.$axios.$get(this.ebookUrl, { - responseType: 'blob' + var buff = await this.$axios.$get(this.ebookUrl, { + responseType: 'blob', + headers: { + Authorization: `Bearer ${this.userToken}` + } }) var reader = new FileReader() reader.onload = async (event) => { diff --git a/client/components/readers/PdfReader.vue b/client/components/readers/PdfReader.vue index d9459d768..c05f459c7 100644 --- a/client/components/readers/PdfReader.vue +++ b/client/components/readers/PdfReader.vue @@ -55,8 +55,7 @@ export default { loadedRatio: 0, page: 1, numPages: 0, - pdfDocInitParams: null, - isRefreshing: false + pdfDocInitParams: null } }, computed: { @@ -153,34 +152,7 @@ export default { this.page++ this.updateProgress() }, - async refreshToken() { - if (this.isRefreshing) return - this.isRefreshing = true - const newAccessToken = await this.$store.dispatch('user/refreshToken').catch((error) => { - console.error('Failed to refresh token', error) - return null - }) - if (!newAccessToken) { - // Redirect to login on failed refresh - this.$router.push('/login') - return - } - - // Force Vue to re-render the PDF component by creating a new object - this.pdfDocInitParams = { - url: this.ebookUrl, - httpHeaders: { - Authorization: `Bearer ${newAccessToken}` - } - } - this.isRefreshing = false - }, - async error(err) { - if (err && err.status === 401) { - console.log('Received 401 error, refreshing token') - await this.refreshToken() - return - } + error(err) { console.error(err) }, resize() { diff --git a/client/components/readers/Reader.vue b/client/components/readers/Reader.vue index a7a5ac3d5..c2e5986ec 100644 --- a/client/components/readers/Reader.vue +++ b/client/components/readers/Reader.vue @@ -266,6 +266,9 @@ export default { isComic() { return this.ebookFormat == 'cbz' || this.ebookFormat == 'cbr' }, + userToken() { + return this.$store.getters['user/getToken'] + }, keepProgress() { return this.$store.state.ereaderKeepProgress }, diff --git a/client/components/tables/ApiKeysTable.vue b/client/components/tables/ApiKeysTable.vue deleted file mode 100644 index feab4e681..000000000 --- a/client/components/tables/ApiKeysTable.vue +++ /dev/null @@ -1,177 +0,0 @@ - - - - - diff --git a/client/components/tables/EbookFilesTable.vue b/client/components/tables/EbookFilesTable.vue index 3ce9d30f0..cc968acd7 100644 --- a/client/components/tables/EbookFilesTable.vue +++ b/client/components/tables/EbookFilesTable.vue @@ -49,6 +49,9 @@ export default { libraryItemId() { return this.libraryItem.id }, + userToken() { + return this.$store.getters['user/getToken'] + }, userCanDownload() { return this.$store.getters['user/getUserCanDownload'] }, diff --git a/client/components/tables/LibraryFilesTable.vue b/client/components/tables/LibraryFilesTable.vue index 6f6e74b8c..9be7e2495 100644 --- a/client/components/tables/LibraryFilesTable.vue +++ b/client/components/tables/LibraryFilesTable.vue @@ -53,6 +53,9 @@ export default { libraryItemId() { return this.libraryItem.id }, + userToken() { + return this.$store.getters['user/getToken'] + }, userCanDownload() { return this.$store.getters['user/getUserCanDownload'] }, diff --git a/client/components/ui/MultiSelectQueryInput.vue b/client/components/ui/MultiSelectQueryInput.vue index 18abc66e7..6de16bf24 100644 --- a/client/components/ui/MultiSelectQueryInput.vue +++ b/client/components/ui/MultiSelectQueryInput.vue @@ -85,6 +85,9 @@ export default { this.$emit('input', val) } }, + userToken() { + return this.$store.getters['user/getToken'] + }, wrapperClass() { var classes = [] if (this.disabled) classes.push('bg-black-300') diff --git a/client/components/ui/SelectInput.vue b/client/components/ui/SelectInput.vue index f38414ac0..9e0961c10 100644 --- a/client/components/ui/SelectInput.vue +++ b/client/components/ui/SelectInput.vue @@ -1,9 +1,9 @@ @@ -21,7 +21,6 @@ export default { type: String, default: 'text' }, - min: [String, Number], readonly: Boolean, disabled: Boolean, inputClass: String, diff --git a/client/layouts/default.vue b/client/layouts/default.vue index 9f15af67e..33e7aa15b 100644 --- a/client/layouts/default.vue +++ b/client/layouts/default.vue @@ -33,7 +33,6 @@ export default { return { socket: null, isSocketConnected: false, - isSocketAuthenticated: false, isFirstSocketConnection: true, socketConnectionToastId: null, currentLang: null, @@ -82,28 +81,9 @@ export default { document.body.classList.add('app-bar') } }, - tokenRefreshed(newAccessToken) { - if (this.isSocketConnected && !this.isSocketAuthenticated) { - console.log('[SOCKET] Re-authenticating socket after token refresh') - this.socket.emit('auth', newAccessToken) - } - }, updateSocketConnectionToast(content, type, timeout) { if (this.socketConnectionToastId !== null && this.socketConnectionToastId !== undefined) { - const toastUpdateOptions = { - content: content, - options: { - timeout: timeout, - type: type, - closeButton: false, - position: 'bottom-center', - onClose: () => { - this.socketConnectionToastId = null - }, - closeOnClick: timeout !== null - } - } - this.$toast.update(this.socketConnectionToastId, toastUpdateOptions, false) + this.$toast.update(this.socketConnectionToastId, { content: content, options: { timeout: timeout, type: type, closeButton: false, position: 'bottom-center', onClose: () => null, closeOnClick: timeout !== null } }, false) } else { this.socketConnectionToastId = this.$toast[type](content, { position: 'bottom-center', timeout: timeout, closeButton: false, closeOnClick: timeout !== null }) } @@ -129,7 +109,7 @@ export default { this.updateSocketConnectionToast(this.$strings.ToastSocketDisconnected, 'error', null) }, reconnect() { - console.log('[SOCKET] reconnected') + console.error('[SOCKET] reconnected') }, reconnectAttempt(val) { console.log(`[SOCKET] reconnect attempt ${val}`) @@ -140,10 +120,6 @@ export default { reconnectFailed() { console.error('[SOCKET] reconnect failed') }, - authFailed(payload) { - console.error('[SOCKET] auth failed', payload.message) - this.isSocketAuthenticated = false - }, init(payload) { console.log('Init Payload', payload) @@ -151,7 +127,7 @@ export default { this.$store.commit('users/setUsersOnline', payload.usersOnline) } - this.isSocketAuthenticated = true + this.$eventBus.$emit('socket_init') }, streamOpen(stream) { if (this.$refs.mediaPlayerContainer) this.$refs.mediaPlayerContainer.streamOpen(stream) @@ -378,15 +354,6 @@ export default { this.$store.commit('scanners/removeCustomMetadataProvider', provider) }, initializeSocket() { - if (this.$root.socket) { - // Can happen in dev due to hot reload - console.warn('Socket already initialized') - this.socket = this.$root.socket - this.isSocketConnected = this.$root.socket?.connected - this.isFirstSocketConnection = false - this.socketConnectionToastId = null - return - } this.socket = this.$nuxtSocket({ name: process.env.NODE_ENV === 'development' ? 'dev' : 'prod', persist: 'main', @@ -397,7 +364,6 @@ export default { path: `${this.$config.routerBasePath}/socket.io` }) this.$root.socket = this.socket - this.isSocketAuthenticated = false console.log('Socket initialized') // Pre-defined socket events @@ -411,7 +377,6 @@ export default { // Event received after authorizing socket this.socket.on('init', this.init) - this.socket.on('auth_failed', this.authFailed) // Stream Listeners this.socket.on('stream_open', this.streamOpen) @@ -606,7 +571,6 @@ export default { this.updateBodyClass() this.resize() this.$eventBus.$on('change-lang', this.changeLanguage) - this.$eventBus.$on('token_refreshed', this.tokenRefreshed) window.addEventListener('resize', this.resize) window.addEventListener('keydown', this.keyDown) @@ -630,7 +594,6 @@ export default { }, beforeDestroy() { this.$eventBus.$off('change-lang', this.changeLanguage) - this.$eventBus.$off('token_refreshed', this.tokenRefreshed) window.removeEventListener('resize', this.resize) window.removeEventListener('keydown', this.keyDown) } diff --git a/client/nuxt.config.js b/client/nuxt.config.js index 7219c7847..f54d1cf49 100644 --- a/client/nuxt.config.js +++ b/client/nuxt.config.js @@ -73,8 +73,7 @@ module.exports = { // Axios module configuration: https://go.nuxtjs.dev/config-axios axios: { - baseURL: routerBasePath, - progress: false + baseURL: routerBasePath }, // nuxt/pwa https://pwa.nuxtjs.org diff --git a/client/package-lock.json b/client/package-lock.json index 406ef9dbe..db21b43f5 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -1,12 +1,12 @@ { "name": "audiobookshelf-client", - "version": "2.26.0", + "version": "2.25.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "audiobookshelf-client", - "version": "2.26.0", + "version": "2.25.1", "license": "ISC", "dependencies": { "@nuxtjs/axios": "^5.13.6", diff --git a/client/package.json b/client/package.json index 5ebaab543..e8823f1be 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "audiobookshelf-client", - "version": "2.26.0", + "version": "2.25.1", "buildNumber": 1, "description": "Self-hosted audiobook and podcast client", "main": "index.js", diff --git a/client/pages/account.vue b/client/pages/account.vue index e9b5da3cb..b157f5704 100644 --- a/client/pages/account.vue +++ b/client/pages/account.vue @@ -182,19 +182,18 @@ export default { password: this.password, newPassword: this.newPassword }) - .then(() => { - this.$toast.success(this.$strings.ToastUserPasswordChangeSuccess) - this.resetForm() + .then((res) => { + if (res.success) { + this.$toast.success(this.$strings.ToastUserPasswordChangeSuccess) + this.resetForm() + } else { + this.$toast.error(res.error || this.$strings.ToastUnknownError) + } + this.changingPassword = false }) .catch((error) => { - console.error('Failed to change password', error) - let errorMessage = this.$strings.ToastUnknownError - if (error.response?.data && typeof error.response.data === 'string') { - errorMessage = error.response.data - } - this.$toast.error(errorMessage) - }) - .finally(() => { + console.error(error) + this.$toast.error(this.$strings.ToastUnknownError) this.changingPassword = false }) }, diff --git a/client/pages/config.vue b/client/pages/config.vue index c4fe24468..5fa145e55 100644 --- a/client/pages/config.vue +++ b/client/pages/config.vue @@ -53,7 +53,6 @@ export default { else if (pageName === 'sessions') return this.$strings.HeaderListeningSessions else if (pageName === 'stats') return this.$strings.HeaderYourStats else if (pageName === 'users') return this.$strings.HeaderUsers - else if (pageName === 'api-keys') return this.$strings.HeaderApiKeys else if (pageName === 'item-metadata-utils') return this.$strings.HeaderItemMetadataUtils else if (pageName === 'rss-feeds') return this.$strings.HeaderRSSFeeds else if (pageName === 'email') return this.$strings.HeaderEmail diff --git a/client/pages/config/api-keys/index.vue b/client/pages/config/api-keys/index.vue deleted file mode 100644 index 2523feed8..000000000 --- a/client/pages/config/api-keys/index.vue +++ /dev/null @@ -1,84 +0,0 @@ - - - diff --git a/client/pages/config/users/_id/index.vue b/client/pages/config/users/_id/index.vue index b48147d3d..f0e6647f3 100644 --- a/client/pages/config/users/_id/index.vue +++ b/client/pages/config/users/_id/index.vue @@ -13,8 +13,8 @@

{{ username }}

-
- +
+
@@ -100,11 +100,8 @@ export default { } }, computed: { - legacyToken() { - return this.user.token - }, userToken() { - return this.user.accessToken + return this.user.token }, bookCoverAspectRatio() { return this.$store.getters['libraries/getBookCoverAspectRatio'] diff --git a/client/pages/login.vue b/client/pages/login.vue index 01adadcd5..3f48509f2 100644 --- a/client/pages/login.vue +++ b/client/pages/login.vue @@ -40,15 +40,6 @@

{{ error }}

-
- -
-

{{ $strings.MessageAuthenticationSecurityMessage }}

- {{ $strings.LabelMoreInfo }} -
- -
-
@@ -94,10 +85,7 @@ export default { MetadataPath: '', login_local: true, login_openid: false, - authFormData: null, - // New JWT auth system re-login flags - showNewAuthSystemMessage: false, - showNewAuthSystemAdminMessage: false + authFormData: null } }, watch: { @@ -191,14 +179,11 @@ export default { this.$store.commit('libraries/setCurrentLibrary', userDefaultLibraryId) this.$store.commit('user/setUser', user) - this.$store.commit('user/setAccessToken', user.accessToken) this.$store.dispatch('user/loadUserSettings') }, async submitForm() { this.error = null - this.showNewAuthSystemMessage = false - this.showNewAuthSystemAdminMessage = false this.processing = true const payload = { @@ -232,23 +217,14 @@ export default { } }) .then((res) => { - // Force re-login if user is using an old token with no expiration - if (res.user.isOldToken) { - this.username = res.user.username - this.showNewAuthSystemMessage = true - // Admin user sees link to github discussion - this.showNewAuthSystemAdminMessage = res.user.type === 'admin' || res.user.type === 'root' - return false - } this.setUser(res) + this.processing = false return true }) .catch((error) => { console.error('Authorize error', error) - return false - }) - .finally(() => { this.processing = false + return false }) }, checkStatus() { @@ -304,9 +280,8 @@ export default { } }, async mounted() { - // Token passed as query parameter after successful oidc login - if (this.$route.query?.accessToken) { - localStorage.setItem('token', this.$route.query.accessToken) + if (this.$route.query?.setToken) { + localStorage.setItem('token', this.$route.query.setToken) } if (localStorage.getItem('token')) { if (await this.checkAuth()) return // if valid user no need to check status diff --git a/client/plugins/axios.js b/client/plugins/axios.js index 66a9fa851..c2ce8dad6 100644 --- a/client/plugins/axios.js +++ b/client/plugins/axios.js @@ -1,19 +1,4 @@ -export default function ({ $axios, store, $root, app }) { - // Track if we're currently refreshing to prevent multiple refresh attempts - let isRefreshing = false - let failedQueue = [] - - const processQueue = (error, token = null) => { - failedQueue.forEach(({ resolve, reject }) => { - if (error) { - reject(error) - } else { - resolve(token) - } - }) - failedQueue = [] - } - +export default function ({ $axios, store, $config }) { $axios.onRequest((config) => { if (!config.url) { console.error('Axios request invalid config', config) @@ -22,7 +7,7 @@ export default function ({ $axios, store, $root, app }) { if (config.url.startsWith('http:') || config.url.startsWith('https:')) { return } - const bearerToken = store.getters['user/getToken'] + const bearerToken = store.state.user.user?.token || null if (bearerToken) { config.headers.common['Authorization'] = `Bearer ${bearerToken}` } @@ -32,79 +17,9 @@ export default function ({ $axios, store, $root, app }) { } }) - $axios.onError(async (error) => { - const originalRequest = error.config + $axios.onError((error) => { const code = parseInt(error.response && error.response.status) const message = error.response ? error.response.data || 'Unknown Error' : 'Unknown Error' - console.error('Axios error', code, message) - - // Handle 401 Unauthorized (token expired) - if (code === 401 && !originalRequest._retry) { - // Skip refresh for auth endpoints to prevent infinite loops - if (originalRequest.url === '/auth/refresh' || originalRequest.url === '/login') { - // Refresh failed or login failed, redirect to login - store.commit('user/setUser', null) - store.commit('user/setAccessToken', null) - app.router.push('/login') - return Promise.reject(error) - } - - if (isRefreshing) { - // If already refreshing, queue this request - return new Promise((resolve, reject) => { - failedQueue.push({ resolve, reject }) - }) - .then((token) => { - if (!originalRequest.headers) { - originalRequest.headers = {} - } - originalRequest.headers['Authorization'] = `Bearer ${token}` - return $axios(originalRequest) - }) - .catch((err) => { - return Promise.reject(err) - }) - } - - originalRequest._retry = true - isRefreshing = true - - try { - // Attempt to refresh the token - // Updates store if successful, otherwise clears store and throw error - const newAccessToken = await store.dispatch('user/refreshToken') - if (!newAccessToken) { - console.error('No new access token received') - return Promise.reject(error) - } - - // Update the original request with new token - if (!originalRequest.headers) { - originalRequest.headers = {} - } - originalRequest.headers['Authorization'] = `Bearer ${newAccessToken}` - - // Process any queued requests - processQueue(null, newAccessToken) - - // Retry the original request - return $axios(originalRequest) - } catch (refreshError) { - console.error('Token refresh failed:', refreshError) - - // Process queued requests with error - processQueue(refreshError, null) - - // Redirect to login - app.router.push('/login') - - return Promise.reject(refreshError) - } finally { - isRefreshing = false - } - } - - return Promise.reject(error) }) } diff --git a/client/store/user.js b/client/store/user.js index a67eae340..41e12cad5 100644 --- a/client/store/user.js +++ b/client/store/user.js @@ -1,6 +1,5 @@ export const state = () => ({ user: null, - accessToken: null, settings: { orderBy: 'media.metadata.title', orderDesc: false, @@ -26,19 +25,19 @@ export const getters = { getIsRoot: (state) => state.user && state.user.type === 'root', getIsAdminOrUp: (state) => state.user && (state.user.type === 'admin' || state.user.type === 'root'), getToken: (state) => { - return state.accessToken || null + return state.user?.token || null }, getUserMediaProgress: (state) => (libraryItemId, episodeId = null) => { - if (!state.user?.mediaProgress) return null + if (!state.user.mediaProgress) return null return state.user.mediaProgress.find((li) => { if (episodeId && li.episodeId !== episodeId) return false return li.libraryItemId == libraryItemId }) }, getUserBookmarksForItem: (state) => (libraryItemId) => { - if (!state.user?.bookmarks) return [] + if (!state.user.bookmarks) return [] return state.user.bookmarks.filter((bm) => bm.libraryItemId === libraryItemId) }, getUserSetting: (state) => (key) => { @@ -146,43 +145,22 @@ export const actions = { } catch (error) { console.error('Failed to load userSettings from local storage', error) } - }, - refreshToken({ state, commit }) { - return this.$axios - .$post('/auth/refresh') - .then(async (response) => { - const newAccessToken = response.user.accessToken - commit('setUser', response.user) - commit('setAccessToken', newAccessToken) - // Emit event used to re-authenticate socket in default.vue since $root is not available here - if (this.$eventBus) { - this.$eventBus.$emit('token_refreshed', newAccessToken) - } - return newAccessToken - }) - .catch((error) => { - console.error('Failed to refresh token', error) - commit('setUser', null) - commit('setAccessToken', null) - // Calling function handles redirect to login - throw error - }) } } export const mutations = { setUser(state, user) { state.user = user - }, - setAccessToken(state, token) { - if (!token) { - localStorage.removeItem('token') - state.accessToken = null + if (user) { + if (user.token) localStorage.setItem('token', user.token) } else { - state.accessToken = token - localStorage.setItem('token', token) + localStorage.removeItem('token') } }, + setUserToken(state, token) { + state.user.token = token + localStorage.setItem('token', token) + }, updateMediaProgress(state, { id, data }) { if (!state.user) return if (!data) { diff --git a/client/strings/en-us.json b/client/strings/en-us.json index 56c29ec1f..3ce20e1ed 100644 --- a/client/strings/en-us.json +++ b/client/strings/en-us.json @@ -1,6 +1,5 @@ { "ButtonAdd": "Add", - "ButtonAddApiKey": "Add API Key", "ButtonAddChapters": "Add Chapters", "ButtonAddDevice": "Add Device", "ButtonAddLibrary": "Add Library", @@ -21,7 +20,6 @@ "ButtonChooseAFolder": "Choose a folder", "ButtonChooseFiles": "Choose files", "ButtonClearFilter": "Clear Filter", - "ButtonClose": "Close", "ButtonCloseFeed": "Close Feed", "ButtonCloseSession": "Close Open Session", "ButtonCollections": "Collections", @@ -121,7 +119,6 @@ "HeaderAccount": "Account", "HeaderAddCustomMetadataProvider": "Add Custom Metadata Provider", "HeaderAdvanced": "Advanced", - "HeaderApiKeys": "API Keys", "HeaderAppriseNotificationSettings": "Apprise Notification Settings", "HeaderAudioTracks": "Audio Tracks", "HeaderAudiobookTools": "Audiobook File Management Tools", @@ -165,7 +162,6 @@ "HeaderMetadataOrderOfPrecedence": "Metadata order of precedence", "HeaderMetadataToEmbed": "Metadata to embed", "HeaderNewAccount": "New Account", - "HeaderNewApiKey": "New API Key", "HeaderNewLibrary": "New Library", "HeaderNotificationCreate": "Create Notification", "HeaderNotificationUpdate": "Update Notification", @@ -210,7 +206,6 @@ "HeaderTableOfContents": "Table of Contents", "HeaderTools": "Tools", "HeaderUpdateAccount": "Update Account", - "HeaderUpdateApiKey": "Update API Key", "HeaderUpdateAuthor": "Update Author", "HeaderUpdateDetails": "Update Details", "HeaderUpdateLibrary": "Update Library", @@ -240,10 +235,6 @@ "LabelAllUsersExcludingGuests": "All users excluding guests", "LabelAllUsersIncludingGuests": "All users including guests", "LabelAlreadyInYourLibrary": "Already in your library", - "LabelApiKeyCreated": "API Key \"{0}\" created successfully.", - "LabelApiKeyCreatedDescription": "Make sure to copy the API key now as you will not be able to see this again.", - "LabelApiKeyUser": "Act on behalf of user", - "LabelApiKeyUserDescription": "This API key will have the same permissions as the user it is acting on behalf of. This will appear the same in logs as if the user was making the request.", "LabelApiToken": "API Token", "LabelAppend": "Append", "LabelAudioBitrate": "Audio Bitrate (e.g. 128k)", @@ -355,10 +346,6 @@ "LabelExample": "Example", "LabelExpandSeries": "Expand Series", "LabelExpandSubSeries": "Expand Sub Series", - "LabelExpired": "Expired", - "LabelExpiresAt": "Expires At", - "LabelExpiresInSeconds": "Expires in (seconds)", - "LabelExpiresNever": "Never", "LabelExplicit": "Explicit", "LabelExplicitChecked": "Explicit (checked)", "LabelExplicitUnchecked": "Not Explicit (unchecked)", @@ -468,7 +455,6 @@ "LabelNewestEpisodes": "Newest Episodes", "LabelNextBackupDate": "Next backup date", "LabelNextScheduledRun": "Next scheduled run", - "LabelNoApiKeys": "No API keys", "LabelNoCustomMetadataProviders": "No custom metadata providers", "LabelNoEpisodesSelected": "No episodes selected", "LabelNotFinished": "Not Finished", @@ -558,7 +544,6 @@ "LabelSelectAll": "Select all", "LabelSelectAllEpisodes": "Select all episodes", "LabelSelectEpisodesShowing": "Select {0} episodes showing", - "LabelSelectUser": "Select user", "LabelSelectUsers": "Select users", "LabelSendEbookToDevice": "Send Ebook to...", "LabelSequence": "Sequence", @@ -724,7 +709,6 @@ "MessageAppriseDescription": "To use this feature you will need to have an instance of Apprise API running or an api that will handle those same requests.
The Apprise API Url should be the full URL path to send the notification, e.g., if your API instance is served at http://192.168.1.1:8337 then you would put http://192.168.1.1:8337/notify.", "MessageAsinCheck": "Ensure you are using the ASIN from the correct Audible region, not Amazon.", "MessageAuthenticationOIDCChangesRestart": "Restart your server after saving to apply OIDC changes.", - "MessageAuthenticationSecurityMessage": "Authentication has been improved for security. All users are required to re-login.", "MessageBackupsDescription": "Backups include users, user progress, library item details, server settings, and images stored in /metadata/items & /metadata/authors. Backups do not include any files stored in your library folders.", "MessageBackupsLocationEditNote": "Note: Updating the backup location will not move or modify existing backups", "MessageBackupsLocationNoEditNote": "Note: The backup location is set through an environment variable and cannot be changed here.", @@ -746,7 +730,6 @@ "MessageChaptersNotFound": "Chapters not found", "MessageCheckingCron": "Checking cron...", "MessageConfirmCloseFeed": "Are you sure you want to close this feed?", - "MessageConfirmDeleteApiKey": "Are you sure you want to delete API key \"{0}\"?", "MessageConfirmDeleteBackup": "Are you sure you want to delete backup for {0}?", "MessageConfirmDeleteDevice": "Are you sure you want to delete e-reader device \"{0}\"?", "MessageConfirmDeleteFile": "This will delete the file from your file system. Are you sure?", @@ -1018,8 +1001,6 @@ "ToastEpisodeDownloadQueueClearSuccess": "Episode download queue cleared", "ToastEpisodeUpdateSuccess": "{0} episodes updated", "ToastErrorCannotShare": "Cannot share natively on this device", - "ToastFailedToCreate": "Failed to create", - "ToastFailedToDelete": "Failed to delete", "ToastFailedToLoadData": "Failed to load data", "ToastFailedToMatch": "Failed to match", "ToastFailedToShare": "Failed to share", @@ -1051,7 +1032,6 @@ "ToastMustHaveAtLeastOnePath": "Must have at least one path", "ToastNameEmailRequired": "Name and email are required", "ToastNameRequired": "Name is required", - "ToastNewApiKeyUserError": "Must select a user", "ToastNewEpisodesFound": "{0} new episodes found", "ToastNewUserCreatedFailed": "Failed to create account: \"{0}\"", "ToastNewUserCreatedSuccess": "New account created", diff --git a/client/strings/hu.json b/client/strings/hu.json index 325ead1ab..cb7bf0702 100644 --- a/client/strings/hu.json +++ b/client/strings/hu.json @@ -278,7 +278,7 @@ "LabelCollapseSeries": "Sorozat összecsukása", "LabelCollapseSubSeries": "Alszéria összecsukása", "LabelCollection": "Gyűjtemény", - "LabelCollections": "Gyűjtemények", + "LabelCollections": "Gyűjtemény", "LabelComplete": "Kész", "LabelConfirmPassword": "Jelszó megerősítése", "LabelContinueListening": "Hallgatás folytatása", @@ -757,7 +757,6 @@ "MessageConfirmRemoveAuthor": "Biztosan eltávolítja a(z) \"{0}\" szerzőt?", "MessageConfirmRemoveCollection": "Biztosan eltávolítja a(z) \"{0}\" gyűjteményt?", "MessageConfirmRemoveEpisode": "Biztosan eltávolítja a(z) \"{0}\" epizódot?", - "MessageConfirmRemoveEpisodeNote": "Megjegyzés: Ez nem törli a hangfájlt, kivéve, ha a \"Hangfájl végleges törlése\" be van kapcsolva", "MessageConfirmRemoveEpisodes": "Biztosan eltávolítja a(z) {0} epizódot?", "MessageConfirmRemoveListeningSessions": "Biztosan eltávolítja a(z) {0} hallgatási munkamenetet?", "MessageConfirmRemoveMetadataFiles": "Biztos, hogy az összes metaadatot el akarja távolítani {0} fájl van könyvtár mappáiban?", diff --git a/client/strings/zh-cn.json b/client/strings/zh-cn.json index 36ec12708..76f4e64ae 100644 --- a/client/strings/zh-cn.json +++ b/client/strings/zh-cn.json @@ -11,7 +11,7 @@ "ButtonAuthors": "作者", "ButtonBack": "返回", "ButtonBatchEditPopulateFromExisting": "用现有内容填充", - "ButtonBatchEditPopulateMapDetails": "填入此项详情", + "ButtonBatchEditPopulateMapDetails": "填充地图详细信息", "ButtonBrowseForFolder": "浏览文件夹", "ButtonCancel": "取消", "ButtonCancelEncode": "取消编码", @@ -73,7 +73,7 @@ "ButtonQuickMatch": "快速匹配", "ButtonReScan": "重新扫描", "ButtonRead": "读取", - "ButtonReadLess": "收起", + "ButtonReadLess": "阅读较少", "ButtonReadMore": "阅读更多", "ButtonRefresh": "刷新", "ButtonRemove": "移除", @@ -714,7 +714,7 @@ "MessageBackupsLocationNoEditNote": "注意: 备份位置是通过环境变量设置的, 不能在此处更改.", "MessageBackupsLocationPathEmpty": "备份位置路径不能为空", "MessageBatchEditPopulateMapDetailsAllHelp": "使用所有项目的数据填充已启用的字段. 具有多个值的字段将被合并", - "MessageBatchEditPopulateMapDetailsItemHelp": "提取此项目的信息，填入上方所有勾选的编辑框中", + "MessageBatchEditPopulateMapDetailsItemHelp": "使用此项目的数据填充已启用的地图详细信息字段", "MessageBatchQuickMatchDescription": "快速匹配将尝试为所选项目添加缺少的封面和元数据. 启用以下选项以允许快速匹配覆盖现有封面和或元数据.", "MessageBookshelfNoCollections": "你尚未进行任何收藏", "MessageBookshelfNoCollectionsHelp": "收藏是公开的. 所有有权访问图书馆的用户都可以看到它们.", @@ -757,7 +757,7 @@ "MessageConfirmRemoveAuthor": "你确定要删除作者 \"{0}\"?", "MessageConfirmRemoveCollection": "你确定要移除收藏 \"{0}\"?", "MessageConfirmRemoveEpisode": "你确定要移除剧集 \"{0}\"?", - "MessageConfirmRemoveEpisodeNote": "注意：此操作不会删除音频文件，除非勾选“完全删除文件”选项", + "MessageConfirmRemoveEpisodeNote": "注意: 除非切换 \"硬删除文件\", 否则不会删除音频文件", "MessageConfirmRemoveEpisodes": "你确定要移除 {0} 剧集?", "MessageConfirmRemoveListeningSessions": "你确定要移除 {0} 收听会话吗?", "MessageConfirmRemoveMetadataFiles": "你确实要删除库项目文件夹中的所有 metadata.{0} 文件吗?", @@ -918,9 +918,9 @@ "NoteUploaderUnsupportedFiles": "不支持的文件将被忽略. 选择或删除文件夹时, 将忽略不在项目文件夹中的其他文件.", "NotificationOnBackupCompletedDescription": "备份完成时触发", "NotificationOnBackupFailedDescription": "备份失败时触发", - "NotificationOnEpisodeDownloadedDescription": "当播客节目自动下载完成时触发", + "NotificationOnEpisodeDownloadedDescription": "当播客节目自动下载时触发", "NotificationOnRSSFeedDisabledDescription": "由于尝试失败次数过多而导致剧集自动下载被禁用时触发", - "NotificationOnRSSFeedFailedDescription": "当用于自动下载剧集的 RSS 源请求失败时触发", + "NotificationOnRSSFeedFailedDescription": "当 RSS 源请求自动下载剧集失败时触发", "NotificationOnTestDescription": "测试通知系统的事件", "PlaceholderNewCollection": "输入收藏夹名称", "PlaceholderNewFolderPath": "输入文件夹路径", diff --git a/package-lock.json b/package-lock.json index 5787f713b..d44ea79bf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,18 +1,17 @@ { "name": "audiobookshelf", - "version": "2.26.0", + "version": "2.25.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "audiobookshelf", - "version": "2.26.0", + "version": "2.25.1", "license": "GPL-3.0", "dependencies": { "axios": "^0.27.2", "cookie-parser": "^1.4.6", "express": "^4.17.1", - "express-rate-limit": "^7.5.1", "express-session": "^1.17.3", "graceful-fs": "^4.2.10", "htmlparser2": "^8.0.1", @@ -1894,21 +1893,6 @@ "node": ">= 0.10.0" } }, - "node_modules/express-rate-limit": { - "version": "7.5.1", - "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-7.5.1.tgz", - "integrity": "sha512-7iN8iPMDzOMHPUYllBEsQdWVB6fPDMPqwjBaFrgr4Jgr/+okjvzAy+UHlYYL/Vs0OsOrMkwS6PJDkFlJwoxUnw==", - "license": "MIT", - "engines": { - "node": ">= 16" - }, - "funding": { - "url": "https://github.com/sponsors/express-rate-limit" - }, - "peerDependencies": { - "express": ">= 4.11" - } - }, "node_modules/express-session": { "version": "1.17.3", "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.17.3.tgz", diff --git a/package.json b/package.json index 586e8d44a..2fd1a87e0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "audiobookshelf", - "version": "2.26.0", + "version": "2.25.1", "buildNumber": 1, "description": "Self-hosted audiobook and podcast server", "main": "index.js", @@ -40,7 +40,6 @@ "axios": "^0.27.2", "cookie-parser": "^1.4.6", "express": "^4.17.1", - "express-rate-limit": "^7.5.1", "express-session": "^1.17.3", "graceful-fs": "^4.2.10", "htmlparser2": "^8.0.1", diff --git a/server/Auth.js b/server/Auth.js index 9c0e2fdb0..4e76ee33a 100644 --- a/server/Auth.js +++ b/server/Auth.js @@ -1,15 +1,15 @@ -const { Request, Response, NextFunction } = require('express') +const axios = require('axios') const passport = require('passport') +const { Request, Response, NextFunction } = require('express') +const bcrypt = require('./libs/bcryptjs') +const jwt = require('./libs/jsonwebtoken') +const requestIp = require('./libs/requestIp') +const LocalStrategy = require('./libs/passportLocal') const JwtStrategy = require('passport-jwt').Strategy const ExtractJwt = require('passport-jwt').ExtractJwt - +const OpenIDClient = require('openid-client') const Database = require('./Database') const Logger = require('./Logger') -const TokenManager = require('./auth/TokenManager') -const LocalAuthStrategy = require('./auth/LocalAuthStrategy') -const OidcAuthStrategy = require('./auth/OidcAuthStrategy') - -const RateLimiterFactory = require('./utils/rateLimiterFactory') const { escapeRegExp } = require('./utils') /** @@ -17,31 +17,22 @@ const { escapeRegExp } = require('./utils') */ class Auth { constructor() { + // Map of openId sessions indexed by oauth2 state-variable + this.openIdAuthSession = new Map() const escapedRouterBasePath = escapeRegExp(global.RouterBasePath) this.ignorePatterns = [new RegExp(`^(${escapedRouterBasePath}/api)?/items/[^/]+/cover$`), new RegExp(`^(${escapedRouterBasePath}/api)?/authors/[^/]+/image$`)] - - /** @type {import('express-rate-limit').RateLimitRequestHandler} */ - this.authRateLimiter = RateLimiterFactory.getAuthRateLimiter() - - this.tokenManager = new TokenManager() - this.localAuthStrategy = new LocalAuthStrategy() - this.oidcAuthStrategy = new OidcAuthStrategy() } /** * Checks if the request should not be authenticated. * @param {Request} req * @returns {boolean} + * @private */ authNotNeeded(req) { return req.method === 'GET' && this.ignorePatterns.some((pattern) => pattern.test(req.path)) } - /** - * Middleware to register passport in express-session - * - * @param {function} middleware - */ ifAuthNeeded(middleware) { return (req, res, next) => { if (this.authNotNeeded(req)) { @@ -51,72 +42,18 @@ class Auth { } } - /** - * middleware to use in express to only allow authenticated users. - * - * @param {Request} req - * @param {Response} res - * @param {NextFunction} next - */ - isAuthenticated(req, res, next) { - return passport.authenticate('jwt', { session: false })(req, res, next) - } - - /** - * Function to generate a jwt token for a given user - * TODO: Old method with no expiration - * @deprecated - * - * @param {{ id:string, username:string }} user - * @returns {string} - */ - generateAccessToken(user) { - return this.tokenManager.generateAccessToken(user) - } - - /** - * Invalidate all JWT sessions for a given user - * If user is current user and refresh token is valid, rotate tokens for the current session - * - * @param {import('./models/User')} user - * @param {Request} req - * @param {Response} res - * @returns {Promise} accessToken only if user is current user and refresh token is valid - */ - async invalidateJwtSessionsForUser(user, req, res) { - return this.tokenManager.invalidateJwtSessionsForUser(user, req, res) - } - - /** - * Return the login info payload for a user - * - * @param {import('./models/User')} user - * @returns {Promise} jsonPayload - */ - async getUserLoginResponsePayload(user) { - const libraryIds = await Database.libraryModel.getAllLibraryIds() - return { - user: user.toOldJSONForBrowser(), - userDefaultLibraryId: user.getDefaultLibraryId(libraryIds), - serverSettings: Database.serverSettings.toJSONForBrowser(), - ereaderDevices: Database.emailSettings.getEReaderDevices(user), - Source: global.Source - } - } - - // #region Passport strategies /** * Inializes all passportjs strategies and other passportjs ralated initialization. */ async initPassportJs() { // Check if we should load the local strategy (username + password login) if (global.ServerSettings.authActiveAuthMethods.includes('local')) { - this.localAuthStrategy.init() + this.initAuthStrategyPassword() } // Check if we should load the openid strategy if (global.ServerSettings.authActiveAuthMethods.includes('openid')) { - this.oidcAuthStrategy.init() + this.initAuthStrategyOpenID() } // Load the JwtStrategy (always) -> for bearer token auth @@ -124,11 +61,9 @@ class Auth { new JwtStrategy( { jwtFromRequest: ExtractJwt.fromExtractors([ExtractJwt.fromAuthHeaderAsBearerToken(), ExtractJwt.fromUrlQueryParameter('token')]), - secretOrKey: TokenManager.TokenSecret, - // Handle expiration manaully in order to disable api keys that are expired - ignoreExpiration: true + secretOrKey: Database.serverSettings.tokenSecret }, - this.tokenManager.jwtAuthCheck.bind(this) + this.jwtAuthCheck.bind(this) ) ) @@ -159,7 +94,248 @@ class Auth { }.bind(this) ) } - // #endregion + + /** + * Passport use LocalStrategy + */ + initAuthStrategyPassword() { + passport.use(new LocalStrategy({ passReqToCallback: true }, this.localAuthCheckUserPw.bind(this))) + } + + /** + * Passport use OpenIDClient.Strategy + */ + initAuthStrategyOpenID() { + if (!Database.serverSettings.isOpenIDAuthSettingsValid) { + Logger.error(`[Auth] Cannot init openid auth strategy - invalid settings`) + return + } + + // Custom req timeout see: https://github.com/panva/node-openid-client/blob/main/docs/README.md#customizing + OpenIDClient.custom.setHttpOptionsDefaults({ timeout: 10000 }) + + const openIdIssuerClient = new OpenIDClient.Issuer({ + issuer: global.ServerSettings.authOpenIDIssuerURL, + authorization_endpoint: global.ServerSettings.authOpenIDAuthorizationURL, + token_endpoint: global.ServerSettings.authOpenIDTokenURL, + userinfo_endpoint: global.ServerSettings.authOpenIDUserInfoURL, + jwks_uri: global.ServerSettings.authOpenIDJwksURL, + end_session_endpoint: global.ServerSettings.authOpenIDLogoutURL + }).Client + const openIdClient = new openIdIssuerClient({ + client_id: global.ServerSettings.authOpenIDClientID, + client_secret: global.ServerSettings.authOpenIDClientSecret, + id_token_signed_response_alg: global.ServerSettings.authOpenIDTokenSigningAlgorithm + }) + passport.use( + 'openid-client', + new OpenIDClient.Strategy( + { + client: openIdClient, + params: { + redirect_uri: `${global.ServerSettings.authOpenIDSubfolderForRedirectURLs}/auth/openid/callback`, + scope: 'openid profile email' + } + }, + async (tokenset, userinfo, done) => { + try { + Logger.debug(`[Auth] openid callback userinfo=`, JSON.stringify(userinfo, null, 2)) + + if (!userinfo.sub) { + throw new Error('Invalid userinfo, no sub') + } + + if (!this.validateGroupClaim(userinfo)) { + throw new Error(`Group claim ${Database.serverSettings.authOpenIDGroupClaim} not found or empty in userinfo`) + } + + let user = await this.findOrCreateUser(userinfo) + + if (!user?.isActive) { + throw new Error('User not active or not found') + } + + await this.setUserGroup(user, userinfo) + await this.updateUserPermissions(user, userinfo) + + // We also have to save the id_token for later (used for logout) because we cannot set cookies here + user.openid_id_token = tokenset.id_token + + return done(null, user) + } catch (error) { + Logger.error(`[Auth] openid callback error: ${error?.message}\n${error?.stack}`) + + return done(null, null, 'Unauthorized') + } + } + ) + ) + } + + /** + * Finds an existing user by OpenID subject identifier, or by email/username based on server settings, + * or creates a new user if configured to do so. + * + * @returns {Promise} + */ + async findOrCreateUser(userinfo) { + let user = await Database.userModel.getUserByOpenIDSub(userinfo.sub) + + // Matched by sub + if (user) { + Logger.debug(`[Auth] openid: User found by sub`) + return user + } + + // Match existing user by email + if (Database.serverSettings.authOpenIDMatchExistingBy === 'email') { + if (userinfo.email) { + // Only disallow when email_verified explicitly set to false (allow both if not set or true) + if (userinfo.email_verified === false) { + Logger.warn(`[Auth] openid: User not found and email "${userinfo.email}" is not verified`) + return null + } else { + Logger.info(`[Auth] openid: User not found, checking existing with email "${userinfo.email}"`) + user = await Database.userModel.getUserByEmail(userinfo.email) + + if (user?.authOpenIDSub) { + Logger.warn(`[Auth] openid: User found with email "${userinfo.email}" but is already matched with sub "${user.authOpenIDSub}"`) + return null // User is linked to a different OpenID subject; do not proceed. + } + } + } else { + Logger.warn(`[Auth] openid: User not found and no email in userinfo`) + // We deny login, because if the admin whishes to match email, it makes sense to require it + return null + } + } + // Match existing user by username + else if (Database.serverSettings.authOpenIDMatchExistingBy === 'username') { + let username + + if (userinfo.preferred_username) { + Logger.info(`[Auth] openid: User not found, checking existing with userinfo.preferred_username "${userinfo.preferred_username}"`) + username = userinfo.preferred_username + } else if (userinfo.username) { + Logger.info(`[Auth] openid: User not found, checking existing with userinfo.username "${userinfo.username}"`) + username = userinfo.username + } else { + Logger.warn(`[Auth] openid: User not found and neither preferred_username nor username in userinfo`) + return null + } + + user = await Database.userModel.getUserByUsername(username) + + if (user?.authOpenIDSub) { + Logger.warn(`[Auth] openid: User found with username "${username}" but is already matched with sub "${user.authOpenIDSub}"`) + return null // User is linked to a different OpenID subject; do not proceed. + } + } + + // Found existing user via email or username + if (user) { + if (!user.isActive) { + Logger.warn(`[Auth] openid: User found but is not active`) + return null + } + + // Update user with OpenID sub + if (!user.extraData) user.extraData = {} + user.extraData.authOpenIDSub = userinfo.sub + user.changed('extraData', true) + await user.save() + + Logger.debug(`[Auth] openid: User found by email/username`) + return user + } + + // If no existing user was matched, auto-register if configured + if (Database.serverSettings.authOpenIDAutoRegister) { + Logger.info(`[Auth] openid: Auto-registering user with sub "${userinfo.sub}"`, userinfo) + user = await Database.userModel.createUserFromOpenIdUserInfo(userinfo, this) + return user + } + + Logger.warn(`[Auth] openid: User not found and auto-register is disabled`) + return null + } + + /** + * Validates the presence and content of the group claim in userinfo. + */ + validateGroupClaim(userinfo) { + const groupClaimName = Database.serverSettings.authOpenIDGroupClaim + if (!groupClaimName) + // Allow no group claim when configured like this + return true + + // If configured it must exist in userinfo + if (!userinfo[groupClaimName]) { + return false + } + return true + } + + /** + * Sets the user group based on group claim in userinfo. + * + * @param {import('./models/User')} user + * @param {Object} userinfo + */ + async setUserGroup(user, userinfo) { + const groupClaimName = Database.serverSettings.authOpenIDGroupClaim + if (!groupClaimName) + // No group claim configured, don't set anything + return + + if (!userinfo[groupClaimName]) throw new Error(`Group claim ${groupClaimName} not found in userinfo`) + + const groupsList = userinfo[groupClaimName].map((group) => group.toLowerCase()) + const rolesInOrderOfPriority = ['admin', 'user', 'guest'] + + let userType = rolesInOrderOfPriority.find((role) => groupsList.includes(role)) + if (userType) { + if (user.type === 'root') { + // Check OpenID Group + if (userType !== 'admin') { + throw new Error(`Root user "${user.username}" cannot be downgraded to ${userType}. Denying login.`) + } else { + // If root user is logging in via OpenID, we will not change the type + return + } + } + + if (user.type !== userType) { + Logger.info(`[Auth] openid callback: Updating user "${user.username}" type to "${userType}" from "${user.type}"`) + user.type = userType + await user.save() + } + } else { + throw new Error(`No valid group found in userinfo: ${JSON.stringify(userinfo[groupClaimName], null, 2)}`) + } + } + + /** + * Updates user permissions based on the advanced permissions claim. + * + * @param {import('./models/User')} user + * @param {Object} userinfo + */ + async updateUserPermissions(user, userinfo) { + const absPermissionsClaim = Database.serverSettings.authOpenIDAdvancedPermsClaim + if (!absPermissionsClaim) + // No advanced permissions claim configured, don't set anything + return + + if (user.type === 'admin' || user.type === 'root') return + + const absPermissions = userinfo[absPermissionsClaim] + if (!absPermissions) throw new Error(`Advanced permissions claim ${absPermissionsClaim} not found in userinfo`) + + if (await user.updatePermissionsFromExternalJSON(absPermissions)) { + Logger.info(`[Auth] openid callback: Updating advanced perms for user "${user.username}" using "${JSON.stringify(absPermissions)}"`) + } + } /** * Unuse strategy @@ -167,13 +343,7 @@ class Auth { * @param {string} name */ unuseAuthStrategy(name) { - if (name === 'openid') { - this.oidcAuthStrategy.unuse() - } else if (name === 'local') { - this.localAuthStrategy.unuse() - } else { - Logger.error('[Auth] Invalid auth strategy ' + name) - } + passport.unuse(name) } /** @@ -183,9 +353,9 @@ class Auth { */ useAuthStrategy(name) { if (name === 'openid') { - this.oidcAuthStrategy.init() + this.initAuthStrategyOpenID() } else if (name === 'local') { - this.localAuthStrategy.init() + this.initAuthStrategyPassword() } else { Logger.error('[Auth] Invalid auth strategy ' + name) } @@ -244,58 +414,25 @@ class Auth { * @param {Response} res */ async handleLoginSuccessBasedOnCookie(req, res) { - // Handle token generation and get userResponse object - // For API based auth (e.g. mobile), we will return the refresh token in the response - const isApiBased = this.isAuthMethodAPIBased(req.cookies.auth_method) - const userResponse = await this.handleLoginSuccess(req, res, isApiBased) + // get userLogin json (information about the user, server and the session) + const data_json = await this.getUserLoginResponsePayload(req.user) - if (isApiBased) { + if (this.isAuthMethodAPIBased(req.cookies.auth_method)) { // REST request - send data - res.json(userResponse) + res.json(data_json) } else { // UI request -> check if we have a callback url // TODO: do we want to somehow limit the values for auth_cb? if (req.cookies.auth_cb) { let stateQuery = req.cookies.auth_state ? `&state=${req.cookies.auth_state}` : '' // UI request -> redirect to auth_cb url and send the jwt token as parameter - // TODO: Temporarily continue sending the old token as setToken - res.redirect(302, `${req.cookies.auth_cb}?setToken=${userResponse.user.token}&accessToken=${userResponse.user.accessToken}${stateQuery}`) + res.redirect(302, `${req.cookies.auth_cb}?setToken=${data_json.user.token}${stateQuery}`) } else { res.status(400).send('No callback or already expired') } } } - /** - * After login success from local or oidc - * req.user is set by passport.authenticate - * - * attaches the access token to the user in the response - * if returnTokens is true, also attaches the refresh token to the user in the response - * - * if returnTokens is false, sets the refresh token cookie - * - * @param {Request} req - * @param {Response} res - * @param {boolean} returnTokens - */ - async handleLoginSuccess(req, res, returnTokens = false) { - // Create tokens and session - const { accessToken, refreshToken } = await this.tokenManager.createTokensAndSession(req.user, req) - - const userResponse = await this.getUserLoginResponsePayload(req.user) - - userResponse.user.refreshToken = returnTokens ? refreshToken : null - userResponse.user.accessToken = accessToken - - if (!returnTokens) { - this.tokenManager.setRefreshTokenCookie(req, res, refreshToken) - } - - return userResponse - } - - // #region Auth routes /** * Creates all (express) routes required for authentication. * @@ -303,68 +440,169 @@ class Auth { */ async initAuthRoutes(router) { // Local strategy login route (takes username and password) - router.post('/login', this.authRateLimiter, passport.authenticate('local'), async (req, res) => { - // Check if mobile app wants refresh token in response - const returnTokens = req.headers['x-return-tokens'] === 'true' + router.post('/login', passport.authenticate('local'), async (req, res) => { + // return the user login response json if the login was successfull + const userResponse = await this.getUserLoginResponsePayload(req.user) - const userResponse = await this.handleLoginSuccess(req, res, returnTokens) - res.json(userResponse) - }) + // Experimental Next.js client uses bearer token in cookies + res.cookie('auth_token', userResponse.user.token, { + httpOnly: true, + secure: req.secure || req.get('x-forwarded-proto') === 'https', + sameSite: 'strict', + maxAge: 1000 * 60 * 60 * 24 * 7 // 7 days + }) - // Refresh token route - router.post('/auth/refresh', this.authRateLimiter, async (req, res) => { - let refreshToken = req.cookies.refresh_token - - // If x-refresh-token header is present, use it instead of the cookie - // and return the refresh token in the response - let shouldReturnRefreshToken = false - if (req.headers['x-refresh-token']) { - refreshToken = req.headers['x-refresh-token'] - shouldReturnRefreshToken = true - } - - if (!refreshToken) { - Logger.error(`[Auth] Failed to refresh token. No refresh token provided`) - return res.status(401).json({ error: 'No refresh token provided' }) - } - - Logger.debug(`[Auth] refreshing token. shouldReturnRefreshToken: ${shouldReturnRefreshToken}`) - - const refreshResponse = await this.tokenManager.handleRefreshToken(refreshToken, req, res) - if (refreshResponse.error) { - return res.status(401).json({ error: refreshResponse.error }) - } - - const userResponse = await this.getUserLoginResponsePayload(refreshResponse.user) - - userResponse.user.accessToken = refreshResponse.accessToken - userResponse.user.refreshToken = shouldReturnRefreshToken ? refreshResponse.refreshToken : null res.json(userResponse) }) // openid strategy login route (this redirects to the configured openid login provider) - router.get('/auth/openid', this.authRateLimiter, (req, res) => { - const authorizationUrlResponse = this.oidcAuthStrategy.getAuthorizationUrl(req) + router.get('/auth/openid', (req, res, next) => { + // Get the OIDC client from the strategy + // We need to call the client manually, because the strategy does not support forwarding the code challenge + // for API or mobile clients + const oidcStrategy = passport._strategy('openid-client') + const client = oidcStrategy._client + const sessionKey = oidcStrategy._key - if (authorizationUrlResponse.error) { - return res.status(authorizationUrlResponse.status).send(authorizationUrlResponse.error) + try { + const protocol = req.secure || req.get('x-forwarded-proto') === 'https' ? 'https' : 'http' + const hostUrl = new URL(`${protocol}://${req.get('host')}`) + const isMobileFlow = req.query.response_type === 'code' || req.query.redirect_uri || req.query.code_challenge + + // Only allow code flow (for mobile clients) + if (req.query.response_type && req.query.response_type !== 'code') { + Logger.debug(`[Auth] OIDC Invalid response_type=${req.query.response_type}`) + return res.status(400).send('Invalid response_type, only code supported') + } + + // Generate a state on web flow or if no state supplied + const state = !isMobileFlow || !req.query.state ? OpenIDClient.generators.random() : req.query.state + + // Redirect URL for the SSO provider + let redirectUri + if (isMobileFlow) { + // Mobile required redirect uri + // If it is in the whitelist, we will save into this.openIdAuthSession and set the redirect uri to /auth/openid/mobile-redirect + // where we will handle the redirect to it + if (!req.query.redirect_uri || !isValidRedirectUri(req.query.redirect_uri)) { + Logger.debug(`[Auth] Invalid redirect_uri=${req.query.redirect_uri}`) + return res.status(400).send('Invalid redirect_uri') + } + // We cannot save the supplied redirect_uri in the session, because it the mobile client uses browser instead of the API + // for the request to mobile-redirect and as such the session is not shared + this.openIdAuthSession.set(state, { mobile_redirect_uri: req.query.redirect_uri }) + + redirectUri = new URL(`${global.ServerSettings.authOpenIDSubfolderForRedirectURLs}/auth/openid/mobile-redirect`, hostUrl).toString() + } else { + redirectUri = new URL(`${global.ServerSettings.authOpenIDSubfolderForRedirectURLs}/auth/openid/callback`, hostUrl).toString() + + if (req.query.state) { + Logger.debug(`[Auth] Invalid state - not allowed on web openid flow`) + return res.status(400).send('Invalid state, not allowed on web flow') + } + } + oidcStrategy._params.redirect_uri = redirectUri + Logger.debug(`[Auth] OIDC redirect_uri=${redirectUri}`) + + let { code_challenge, code_challenge_method, code_verifier } = generatePkce(req, isMobileFlow) + + req.session[sessionKey] = { + ...req.session[sessionKey], + state: state, + max_age: oidcStrategy._params.max_age, + response_type: 'code', + code_verifier: code_verifier, // not null if web flow + mobile: req.query.redirect_uri, // Used in the abs callback later, set mobile if redirect_uri is filled out + sso_redirect_uri: oidcStrategy._params.redirect_uri // Save the redirect_uri (for the SSO Provider) for the callback + } + + var scope = 'openid profile email' + if (global.ServerSettings.authOpenIDGroupClaim) { + scope += ' ' + global.ServerSettings.authOpenIDGroupClaim + } + if (global.ServerSettings.authOpenIDAdvancedPermsClaim) { + scope += ' ' + global.ServerSettings.authOpenIDAdvancedPermsClaim + } + + const authorizationUrl = client.authorizationUrl({ + ...oidcStrategy._params, + state: state, + response_type: 'code', + scope: scope, + code_challenge, + code_challenge_method + }) + + this.paramsToCookies(req, res, isMobileFlow ? 'openid-mobile' : 'openid') + + res.redirect(authorizationUrl) + } catch (error) { + Logger.error(`[Auth] Error in /auth/openid route: ${error}\n${error?.stack}`) + res.status(500).send('Internal Server Error') } - this.paramsToCookies(req, res, authorizationUrlResponse.isMobileFlow ? 'openid-mobile' : 'openid') + function generatePkce(req, isMobileFlow) { + if (isMobileFlow) { + if (!req.query.code_challenge) { + throw new Error('code_challenge required for mobile flow (PKCE)') + } + if (req.query.code_challenge_method && req.query.code_challenge_method !== 'S256') { + throw new Error('Only S256 code_challenge_method method supported') + } + return { + code_challenge: req.query.code_challenge, + code_challenge_method: req.query.code_challenge_method || 'S256' + } + } else { + const code_verifier = OpenIDClient.generators.codeVerifier() + const code_challenge = OpenIDClient.generators.codeChallenge(code_verifier) + return { code_challenge, code_challenge_method: 'S256', code_verifier } + } + } - res.redirect(authorizationUrlResponse.authorizationUrl) + function isValidRedirectUri(uri) { + // Check if the redirect_uri is in the whitelist + return Database.serverSettings.authOpenIDMobileRedirectURIs.includes(uri) || (Database.serverSettings.authOpenIDMobileRedirectURIs.length === 1 && Database.serverSettings.authOpenIDMobileRedirectURIs[0] === '*') + } }) // This will be the oauth2 callback route for mobile clients // It will redirect to an app-link like audiobookshelf://oauth - router.get('/auth/openid/mobile-redirect', this.authRateLimiter, (req, res) => this.oidcAuthStrategy.handleMobileRedirect(req, res)) + router.get('/auth/openid/mobile-redirect', (req, res) => { + try { + // Extract the state parameter from the request + const { state, code } = req.query + + // Check if the state provided is in our list + if (!state || !this.openIdAuthSession.has(state)) { + Logger.error('[Auth] /auth/openid/mobile-redirect route: State parameter mismatch') + return res.status(400).send('State parameter mismatch') + } + + let mobile_redirect_uri = this.openIdAuthSession.get(state).mobile_redirect_uri + + if (!mobile_redirect_uri) { + Logger.error('[Auth] No redirect URI') + return res.status(400).send('No redirect URI') + } + + this.openIdAuthSession.delete(state) + + const redirectUri = `${mobile_redirect_uri}?code=${encodeURIComponent(code)}&state=${encodeURIComponent(state)}` + // Redirect to the overwrite URI saved in the map + res.redirect(redirectUri) + } catch (error) { + Logger.error(`[Auth] Error in /auth/openid/mobile-redirect route: ${error}\n${error?.stack}`) + res.status(500).send('Internal Server Error') + } + }) // openid strategy callback route (this receives the token from the configured openid login provider) router.get( '/auth/openid/callback', - this.authRateLimiter, (req, res, next) => { - const sessionKey = this.oidcAuthStrategy.getStrategy()._key + const oidcStrategy = passport._strategy('openid-client') + const sessionKey = oidcStrategy._key if (!req.session[sessionKey]) { return res.status(400).send('No session') @@ -435,41 +673,54 @@ class Auth { * * @example /auth/openid/config?issuer=http://192.168.1.66:9000/application/o/audiobookshelf/ */ - router.get('/auth/openid/config', this.authRateLimiter, this.isAuthenticated, async (req, res) => { + router.get('/auth/openid/config', this.isAuthenticated, async (req, res) => { if (!req.user.isAdminOrUp) { Logger.error(`[Auth] Non-admin user "${req.user.username}" attempted to get issuer config`) return res.sendStatus(403) } - if (!req.query.issuer || typeof req.query.issuer !== 'string') { + if (!req.query.issuer) { return res.status(400).send("Invalid request. Query param 'issuer' is required") } - const openIdIssuerConfig = await this.oidcAuthStrategy.getIssuerConfig(req.query.issuer) - if (openIdIssuerConfig.error) { - return res.status(openIdIssuerConfig.status).send(openIdIssuerConfig.error) + // Strip trailing slash + let issuerUrl = req.query.issuer + if (issuerUrl.endsWith('/')) issuerUrl = issuerUrl.slice(0, -1) + + // Append config pathname and validate URL + let configUrl = null + try { + configUrl = new URL(`${issuerUrl}/.well-known/openid-configuration`) + if (!configUrl.pathname.endsWith('/.well-known/openid-configuration')) { + throw new Error('Invalid pathname') + } + } catch (error) { + Logger.error(`[Auth] Failed to get openid configuration. Invalid URL "${configUrl}"`, error) + return res.status(400).send("Invalid request. Query param 'issuer' is invalid") } - res.json(openIdIssuerConfig) + axios + .get(configUrl.toString()) + .then(({ data }) => { + res.json({ + issuer: data.issuer, + authorization_endpoint: data.authorization_endpoint, + token_endpoint: data.token_endpoint, + userinfo_endpoint: data.userinfo_endpoint, + end_session_endpoint: data.end_session_endpoint, + jwks_uri: data.jwks_uri, + id_token_signing_alg_values_supported: data.id_token_signing_alg_values_supported + }) + }) + .catch((error) => { + Logger.error(`[Auth] Failed to get openid configuration at "${configUrl}"`, error) + res.status(error.statusCode || 400).send(`${error.code || 'UNKNOWN'}: Failed to get openid configuration`) + }) }) // Logout route - router.post('/logout', async (req, res) => { - // Refresh token be alternatively be sent in the header - const refreshToken = req.cookies.refresh_token || req.headers['x-refresh-token'] - - // Clear refresh token cookie - res.clearCookie('refresh_token', { - path: '/' - }) - - // Invalidate the session in database using refresh token - if (refreshToken) { - await this.tokenManager.invalidateRefreshToken(refreshToken) - } else { - Logger.info(`[Auth] logout: No refresh token on request`) - } - + router.post('/logout', (req, res) => { + // TODO: invalidate possible JWTs req.logout((err) => { if (err) { res.sendStatus(500) @@ -477,11 +728,41 @@ class Auth { const authMethod = req.cookies.auth_method res.clearCookie('auth_method') + res.clearCookie('auth_token') let logoutUrl = null if (authMethod === 'openid' || authMethod === 'openid-mobile') { - logoutUrl = this.oidcAuthStrategy.getEndSessionUrl(req, req.cookies.openid_id_token, authMethod) + // If we are using openid, we need to redirect to the logout endpoint + // node-openid-client does not support doing it over passport + const oidcStrategy = passport._strategy('openid-client') + const client = oidcStrategy._client + + if (client.issuer.end_session_endpoint && client.issuer.end_session_endpoint.length > 0) { + let postLogoutRedirectUri = null + + if (authMethod === 'openid') { + const protocol = req.secure || req.get('x-forwarded-proto') === 'https' ? 'https' : 'http' + const host = req.get('host') + // TODO: ABS does currently not support subfolders for installation + // If we want to support it we need to include a config for the serverurl + postLogoutRedirectUri = `${protocol}://${host}${global.RouterBasePath}/login` + } + // else for openid-mobile we keep postLogoutRedirectUri on null + // nice would be to redirect to the app here, but for example Authentik does not implement + // the post_logout_redirect_uri parameter at all and for other providers + // we would also need again to implement (and even before get to know somehow for 3rd party apps) + // the correct app link like audiobookshelf://login (and maybe also provide a redirect like mobile-redirect). + // Instead because its null (and this way the parameter will be omitted completly), the client/app can simply append something like + // &post_logout_redirect_uri=audiobookshelf://login to the received logout url by itself which is the simplest solution + // (The URL needs to be whitelisted in the config of the SSO/ID provider) + + logoutUrl = client.endSessionUrl({ + id_token_hint: req.cookies.openid_id_token, + post_logout_redirect_uri: postLogoutRedirectUri + }) + } + res.clearCookie('openid_id_token') } @@ -492,7 +773,249 @@ class Auth { }) }) } - // #endregion + + /** + * middleware to use in express to only allow authenticated users. + * @param {Request} req + * @param {Response} res + * @param {NextFunction} next + */ + isAuthenticated(req, res, next) { + // check if session cookie says that we are authenticated + if (req.isAuthenticated()) { + next() + } else { + // try JWT to authenticate + passport.authenticate('jwt')(req, res, next) + } + } + + /** + * Function to generate a jwt token for a given user + * + * @param {{ id:string, username:string }} user + * @returns {string} token + */ + generateAccessToken(user) { + return jwt.sign({ userId: user.id, username: user.username }, global.ServerSettings.tokenSecret) + } + + /** + * Function to validate a jwt token for a given user + * + * @param {string} token + * @returns {Object} tokens data + */ + static validateAccessToken(token) { + try { + return jwt.verify(token, global.ServerSettings.tokenSecret) + } catch (err) { + return null + } + } + + /** + * Generate a token which is used to encrpt/protect the jwts. + */ + async initTokenSecret() { + if (process.env.TOKEN_SECRET) { + // User can supply their own token secret + Database.serverSettings.tokenSecret = process.env.TOKEN_SECRET + } else { + Database.serverSettings.tokenSecret = require('crypto').randomBytes(256).toString('base64') + } + await Database.updateServerSettings() + + // New token secret creation added in v2.1.0 so generate new API tokens for each user + const users = await Database.userModel.findAll({ + attributes: ['id', 'username', 'token'] + }) + if (users.length) { + for (const user of users) { + user.token = await this.generateAccessToken(user) + await user.save({ hooks: false }) + } + } + } + + /** + * Checks if the user in the validated jwt_payload really exists and is active. + * @param {Object} jwt_payload + * @param {function} done + */ + async jwtAuthCheck(jwt_payload, done) { + // load user by id from the jwt token + const user = await Database.userModel.getUserByIdOrOldId(jwt_payload.userId) + + if (!user?.isActive) { + // deny login + done(null, null) + return + } + // approve login + done(null, user) + return + } + + /** + * Checks if a username and password tuple is valid and the user active. + * @param {Request} req + * @param {string} username + * @param {string} password + * @param {Promise} done + */ + async localAuthCheckUserPw(req, username, password, done) { + // Load the user given it's username + const user = await Database.userModel.getUserByUsername(username.toLowerCase()) + + if (!user?.isActive) { + if (user) { + this.logFailedLocalAuthLoginAttempt(req, user.username, 'User is not active') + } else { + this.logFailedLocalAuthLoginAttempt(req, username, 'User not found') + } + done(null, null) + return + } + + // Check passwordless root user + if (user.type === 'root' && !user.pash) { + if (password) { + // deny login + this.logFailedLocalAuthLoginAttempt(req, user.username, 'Root user has no password set') + done(null, null) + return + } + // approve login + Logger.info(`[Auth] User "${user.username}" logged in from ip ${requestIp.getClientIp(req)}`) + done(null, user) + return + } else if (!user.pash) { + this.logFailedLocalAuthLoginAttempt(req, user.username, 'User has no password set. Might have been created with OpenID') + done(null, null) + return + } + + // Check password match + const compare = await bcrypt.compare(password, user.pash) + if (compare) { + // approve login + Logger.info(`[Auth] User "${user.username}" logged in from ip ${requestIp.getClientIp(req)}`) + done(null, user) + return + } + // deny login + this.logFailedLocalAuthLoginAttempt(req, user.username, 'Invalid password') + done(null, null) + return + } + + /** + * + * @param {Request} req + * @param {string} username + * @param {string} message + */ + logFailedLocalAuthLoginAttempt(req, username, message) { + if (!req || !username || !message) return + Logger.error(`[Auth] Failed login attempt for username "${username}" from ip ${requestIp.getClientIp(req)} (${message})`) + } + + /** + * Hashes a password with bcrypt. + * @param {string} password + * @returns {Promise} hash + */ + hashPass(password) { + return new Promise((resolve) => { + bcrypt.hash(password, 8, (err, hash) => { + if (err) { + resolve(null) + } else { + resolve(hash) + } + }) + }) + } + + /** + * Return the login info payload for a user + * + * @param {import('./models/User')} user + * @returns {Promise} jsonPayload + */ + async getUserLoginResponsePayload(user) { + const libraryIds = await Database.libraryModel.getAllLibraryIds() + return { + user: user.toOldJSONForBrowser(), + userDefaultLibraryId: user.getDefaultLibraryId(libraryIds), + serverSettings: Database.serverSettings.toJSONForBrowser(), + ereaderDevices: Database.emailSettings.getEReaderDevices(user), + Source: global.Source + } + } + + /** + * + * @param {string} password + * @param {import('./models/User')} user + * @returns {Promise} + */ + comparePassword(password, user) { + if (user.type === 'root' && !password && !user.pash) return true + if (!password || !user.pash) return false + return bcrypt.compare(password, user.pash) + } + + /** + * User changes their password from request + * TODO: Update responses to use error status codes + * + * @param {import('./controllers/MeController').RequestWithUser} req + * @param {Response} res + */ + async userChangePassword(req, res) { + let { password, newPassword } = req.body + newPassword = newPassword || '' + const matchingUser = req.user + + // Only root can have an empty password + if (matchingUser.type !== 'root' && !newPassword) { + return res.json({ + error: 'Invalid new password - Only root can have an empty password' + }) + } + + // Check password match + const compare = await this.comparePassword(password, matchingUser) + if (!compare) { + return res.json({ + error: 'Invalid password' + }) + } + + let pw = '' + if (newPassword) { + pw = await this.hashPass(newPassword) + if (!pw) { + return res.json({ + error: 'Hash failed' + }) + } + } + try { + await matchingUser.update({ pash: pw }) + Logger.info(`[Auth] User "${matchingUser.username}" changed password`) + res.json({ + success: true + }) + } catch (error) { + Logger.error(`[Auth] User "${matchingUser.username}" failed to change password`, error) + res.json({ + error: 'Unknown error' + }) + } + } } module.exports = Auth diff --git a/server/Database.js b/server/Database.js index 213c2c61b..a260e89f2 100644 --- a/server/Database.js +++ b/server/Database.js @@ -42,16 +42,6 @@ class Database { return this.models.user } - /** @type {typeof import('./models/Session')} */ - get sessionModel() { - return this.models.session - } - - /** @type {typeof import('./models/ApiKey')} */ - get apiKeyModel() { - return this.models.apiKey - } - /** @type {typeof import('./models/Library')} */ get libraryModel() { return this.models.library @@ -321,8 +311,6 @@ class Database { buildModels(force = false) { require('./models/User').init(this.sequelize) - require('./models/Session').init(this.sequelize) - require('./models/ApiKey').init(this.sequelize) require('./models/Library').init(this.sequelize) require('./models/LibraryFolder').init(this.sequelize) require('./models/Book').init(this.sequelize) @@ -668,9 +656,6 @@ class Database { * Series should have atleast one Book * Book and Podcast must have an associated LibraryItem (and vice versa) * Remove playback sessions that are 3 seconds or less - * Remove duplicate mediaProgresses - * Remove expired auth sessions - * Deactivate expired api keys */ async cleanDatabase() { // Remove invalid Podcast records @@ -800,40 +785,6 @@ WHERE EXISTS ( where: { id: duplicateMediaProgress.id } }) } - - // Remove expired Session records - await this.cleanupExpiredSessions() - - // Deactivate expired api keys - await this.deactivateExpiredApiKeys() - } - - /** - * Deactivate expired api keys - */ - async deactivateExpiredApiKeys() { - try { - const affectedCount = await this.apiKeyModel.deactivateExpiredApiKeys() - if (affectedCount > 0) { - Logger.info(`[Database] Deactivated ${affectedCount} expired api keys`) - } - } catch (error) { - Logger.error(`[Database] Error deactivating expired api keys: ${error.message}`) - } - } - - /** - * Clean up expired sessions from the database - */ - async cleanupExpiredSessions() { - try { - const deletedCount = await this.sessionModel.cleanupExpiredSessions() - if (deletedCount > 0) { - Logger.info(`[Database] Cleaned up ${deletedCount} expired sessions`) - } - } catch (error) { - Logger.error(`[Database] Error cleaning up expired sessions: ${error.message}`) - } } async createTextSearchQuery(query) { diff --git a/server/Server.js b/server/Server.js index 99e72d0c0..22a53a3ad 100644 --- a/server/Server.js +++ b/server/Server.js @@ -156,11 +156,14 @@ class Server { } await Database.init(false) - // Create or set JWT secret in token manager - await this.auth.tokenManager.initTokenSecret() await Logger.logManager.init() + // Create token secret if does not exist (Added v2.1.0) + if (!Database.serverSettings.tokenSecret) { + await this.auth.initTokenSecret() + } + await this.cleanUserData() // Remove invalid user item progress await CacheManager.ensureCachePaths() @@ -261,7 +264,7 @@ class Server { // enable express-session app.use( expressSession({ - secret: this.auth.tokenManager.TokenSecret, + secret: global.ServerSettings.tokenSecret, resave: false, saveUninitialized: false, cookie: { @@ -306,9 +309,7 @@ class Server { }) ) router.use(express.urlencoded({ extended: true, limit: '5mb' })) - - // Skip JSON parsing for internal-api routes - router.use(/^(?!\/internal-api).*/, express.json({ limit: '10mb' })) + router.use(express.json({ limit: '10mb' })) router.use('/api', this.auth.ifAuthNeeded(this.authMiddleware.bind(this)), this.apiRouter.router) router.use('/hls', this.hlsRouter.router) @@ -403,7 +404,6 @@ class Server { const handle = nextApp.getRequestHandler() await nextApp.prepare() router.get('*', (req, res) => handle(req, res)) - router.post('/internal-api/*', (req, res) => handle(req, res)) } const unixSocketPrefix = 'unix/' @@ -428,7 +428,7 @@ class Server { Logger.info(`[Server] Initializing new server`) const newRoot = req.body.newRoot const rootUsername = newRoot.username || 'root' - const rootPash = newRoot.password ? await this.auth.localAuthStrategy.hashPassword(newRoot.password) : '' + const rootPash = newRoot.password ? await this.auth.hashPass(newRoot.password) : '' if (!rootPash) Logger.warn(`[Server] Creating root user with no password`) await Database.createRootUser(rootUsername, rootPash, this.auth) diff --git a/server/SocketAuthority.js b/server/SocketAuthority.js index da31ba4a0..050e7e2f2 100644 --- a/server/SocketAuthority.js +++ b/server/SocketAuthority.js @@ -1,7 +1,7 @@ const SocketIO = require('socket.io') const Logger = require('./Logger') const Database = require('./Database') -const TokenManager = require('./auth/TokenManager') +const Auth = require('./Auth') /** * @typedef SocketClient @@ -231,22 +231,18 @@ class SocketAuthority { * When setting up a socket connection the user needs to be associated with a socket id * for this the client will send a 'auth' event that includes the users API token * - * Sends event 'init' to the socket. For admins this contains an array of users online. - * For failed authentication it sends event 'auth_failed' with a message - * * @param {SocketIO.Socket} socket * @param {string} token JWT */ async authenticateSocket(socket, token) { // we don't use passport to authenticate the jwt we get over the socket connection. // it's easier to directly verify/decode it. - // TODO: Support API keys for web socket connections - const token_data = TokenManager.validateAccessToken(token) + const token_data = Auth.validateAccessToken(token) if (!token_data?.userId) { // Token invalid Logger.error('Cannot validate socket - invalid token') - return socket.emit('auth_failed', { message: 'Invalid token' }) + return socket.emit('invalid_token') } // get the user via the id from the decoded jwt. @@ -254,11 +250,7 @@ class SocketAuthority { if (!user) { // user not found Logger.error('Cannot validate socket - invalid token') - return socket.emit('auth_failed', { message: 'Invalid token' }) - } - if (!user.isActive) { - Logger.error('Cannot validate socket - user is not active') - return socket.emit('auth_failed', { message: 'Invalid user' }) + return socket.emit('invalid_token') } const client = this.clients[socket.id] @@ -268,18 +260,13 @@ class SocketAuthority { } if (client.user !== undefined) { - if (client.user.id === user.id) { - // Allow re-authentication of a socket to the same user - Logger.info(`[SocketAuthority] Authenticating socket already associated to user "${client.user.username}"`) - } else { - // Allow re-authentication of a socket to a different user but shouldn't happen - Logger.warn(`[SocketAuthority] Authenticating socket to user "${user.username}", but is already associated with a different user "${client.user.username}"`) - } - } else { - Logger.debug(`[SocketAuthority] Authenticating socket to user "${user.username}"`) + Logger.debug(`[SocketAuthority] Authenticating socket client already has user`, client.user.username) } client.user = user + + Logger.debug(`[SocketAuthority] User Online ${client.user.username}`) + this.adminEmitter('user_online', client.user.toJSONForPublic(this.Server.playbackSessionManager.sessions)) // Update user lastSeen without firing sequelize bulk update hooks diff --git a/server/auth/LocalAuthStrategy.js b/server/auth/LocalAuthStrategy.js deleted file mode 100644 index e9499d13d..000000000 --- a/server/auth/LocalAuthStrategy.js +++ /dev/null @@ -1,186 +0,0 @@ -const passport = require('passport') -const LocalStrategy = require('../libs/passportLocal') -const Database = require('../Database') -const Logger = require('../Logger') - -const bcrypt = require('../libs/bcryptjs') -const requestIp = require('../libs/requestIp') - -/** - * Local authentication strategy using username/password - */ -class LocalAuthStrategy { - constructor() { - this.name = 'local' - this.strategy = null - } - - /** - * Get the passport strategy instance - * @returns {LocalStrategy} - */ - getStrategy() { - if (!this.strategy) { - this.strategy = new LocalStrategy({ passReqToCallback: true }, this.verifyCredentials.bind(this)) - } - return this.strategy - } - - /** - * Initialize the strategy with passport - */ - init() { - passport.use(this.name, this.getStrategy()) - } - - /** - * Remove the strategy from passport - */ - unuse() { - passport.unuse(this.name) - this.strategy = null - } - - /** - * Verify user credentials - * @param {import('express').Request} req - * @param {string} username - * @param {string} password - * @param {Function} done - Passport callback - */ - async verifyCredentials(req, username, password, done) { - // Load the user given it's username - const user = await Database.userModel.getUserByUsername(username.toLowerCase()) - - if (!user?.isActive) { - if (user) { - this.logFailedLoginAttempt(req, user.username, 'User is not active') - } else { - this.logFailedLoginAttempt(req, username, 'User not found') - } - done(null, null) - return - } - - // Check passwordless root user - if (user.type === 'root' && !user.pash) { - if (password) { - // deny login - this.logFailedLoginAttempt(req, user.username, 'Root user has no password set') - done(null, null) - return - } - // approve login - Logger.info(`[LocalAuth] User "${user.username}" logged in from ip ${requestIp.getClientIp(req)}`) - - done(null, user) - return - } else if (!user.pash) { - this.logFailedLoginAttempt(req, user.username, 'User has no password set. Might have been created with OpenID') - done(null, null) - return - } - - // Check password match - const compare = await bcrypt.compare(password, user.pash) - if (compare) { - // approve login - Logger.info(`[LocalAuth] User "${user.username}" logged in from ip ${requestIp.getClientIp(req)}`) - - done(null, user) - return - } - - // deny login - this.logFailedLoginAttempt(req, user.username, 'Invalid password') - done(null, null) - } - - /** - * Log failed login attempts - * @param {import('express').Request} req - * @param {string} username - * @param {string} message - */ - logFailedLoginAttempt(req, username, message) { - if (!req || !username || !message) return - Logger.error(`[LocalAuth] Failed login attempt for username "${username}" from ip ${requestIp.getClientIp(req)} (${message})`) - } - - /** - * Hash a password with bcrypt - * @param {string} password - * @returns {Promise} hash - */ - hashPassword(password) { - return new Promise((resolve) => { - bcrypt.hash(password, 8, (err, hash) => { - if (err) { - resolve(null) - } else { - resolve(hash) - } - }) - }) - } - - /** - * Compare password with user's hashed password - * @param {string} password - * @param {import('../models/User')} user - * @returns {Promise} - */ - comparePassword(password, user) { - if (user.type === 'root' && !password && !user.pash) return true - if (!password || !user.pash) return false - return bcrypt.compare(password, user.pash) - } - - /** - * Change user password - * @param {import('../models/User')} user - * @param {string} password - * @param {string} newPassword - */ - async changePassword(user, password, newPassword) { - // Only root can have an empty password - if (user.type !== 'root' && !newPassword) { - return { - error: 'Invalid new password - Only root can have an empty password' - } - } - - // Check password match - const compare = await this.comparePassword(password, user) - if (!compare) { - return { - error: 'Invalid password' - } - } - - let pw = '' - if (newPassword) { - pw = await this.hashPassword(newPassword) - if (!pw) { - return { - error: 'Hash failed' - } - } - } - - try { - await user.update({ pash: pw }) - Logger.info(`[LocalAuth] User "${user.username}" changed password`) - return { - success: true - } - } catch (error) { - Logger.error(`[LocalAuth] User "${user.username}" failed to change password`, error) - return { - error: 'Unknown error' - } - } - } -} - -module.exports = LocalAuthStrategy diff --git a/server/auth/OidcAuthStrategy.js b/server/auth/OidcAuthStrategy.js deleted file mode 100644 index c3f6cfb22..000000000 --- a/server/auth/OidcAuthStrategy.js +++ /dev/null @@ -1,488 +0,0 @@ -const { Request, Response } = require('express') -const passport = require('passport') -const OpenIDClient = require('openid-client') -const axios = require('axios') -const Database = require('../Database') -const Logger = require('../Logger') - -/** - * OpenID Connect authentication strategy - */ -class OidcAuthStrategy { - constructor() { - this.name = 'openid-client' - this.strategy = null - this.client = null - // Map of openId sessions indexed by oauth2 state-variable - this.openIdAuthSession = new Map() - } - - /** - * Get the passport strategy instance - * @returns {OpenIDClient.Strategy} - */ - getStrategy() { - if (!this.strategy) { - this.strategy = new OpenIDClient.Strategy( - { - client: this.getClient(), - params: { - redirect_uri: `${global.ServerSettings.authOpenIDSubfolderForRedirectURLs}/auth/openid/callback`, - scope: this.getScope() - } - }, - this.verifyCallback.bind(this) - ) - } - return this.strategy - } - - /** - * Get the OpenID Connect client - * @returns {OpenIDClient.Client} - */ - getClient() { - if (!this.client) { - if (!Database.serverSettings.isOpenIDAuthSettingsValid) { - throw new Error('OpenID Connect settings are not valid') - } - - // Custom req timeout see: https://github.com/panva/node-openid-client/blob/main/docs/README.md#customizing - OpenIDClient.custom.setHttpOptionsDefaults({ timeout: 10000 }) - - const openIdIssuerClient = new OpenIDClient.Issuer({ - issuer: global.ServerSettings.authOpenIDIssuerURL, - authorization_endpoint: global.ServerSettings.authOpenIDAuthorizationURL, - token_endpoint: global.ServerSettings.authOpenIDTokenURL, - userinfo_endpoint: global.ServerSettings.authOpenIDUserInfoURL, - jwks_uri: global.ServerSettings.authOpenIDJwksURL, - end_session_endpoint: global.ServerSettings.authOpenIDLogoutURL - }).Client - - this.client = new openIdIssuerClient({ - client_id: global.ServerSettings.authOpenIDClientID, - client_secret: global.ServerSettings.authOpenIDClientSecret, - id_token_signed_response_alg: global.ServerSettings.authOpenIDTokenSigningAlgorithm - }) - } - return this.client - } - - /** - * Get the scope string for the OpenID Connect request - * @returns {string} - */ - getScope() { - let scope = 'openid profile email' - if (global.ServerSettings.authOpenIDGroupClaim) { - scope += ' ' + global.ServerSettings.authOpenIDGroupClaim - } - if (global.ServerSettings.authOpenIDAdvancedPermsClaim) { - scope += ' ' + global.ServerSettings.authOpenIDAdvancedPermsClaim - } - return scope - } - - /** - * Initialize the strategy with passport - */ - init() { - if (!Database.serverSettings.isOpenIDAuthSettingsValid) { - Logger.error(`[OidcAuth] Cannot init openid auth strategy - invalid settings`) - return - } - passport.use(this.name, this.getStrategy()) - } - - /** - * Remove the strategy from passport - */ - unuse() { - passport.unuse(this.name) - this.strategy = null - this.client = null - } - - /** - * Verify callback for OpenID Connect authentication - * @param {Object} tokenset - * @param {Object} userinfo - * @param {Function} done - Passport callback - */ - async verifyCallback(tokenset, userinfo, done) { - try { - Logger.debug(`[OidcAuth] openid callback userinfo=`, JSON.stringify(userinfo, null, 2)) - - if (!userinfo.sub) { - throw new Error('Invalid userinfo, no sub') - } - - if (!this.validateGroupClaim(userinfo)) { - throw new Error(`Group claim ${Database.serverSettings.authOpenIDGroupClaim} not found or empty in userinfo`) - } - - let user = await Database.userModel.findOrCreateUserFromOpenIdUserInfo(userinfo, this) - - if (!user?.isActive) { - throw new Error('User not active or not found') - } - - await this.setUserGroup(user, userinfo) - await this.updateUserPermissions(user, userinfo) - - // We also have to save the id_token for later (used for logout) because we cannot set cookies here - user.openid_id_token = tokenset.id_token - - return done(null, user) - } catch (error) { - Logger.error(`[OidcAuth] openid callback error: ${error?.message}\n${error?.stack}`) - return done(null, null, 'Unauthorized') - } - } - - /** - * Validates the presence and content of the group claim in userinfo. - * @param {Object} userinfo - * @returns {boolean} - */ - validateGroupClaim(userinfo) { - const groupClaimName = Database.serverSettings.authOpenIDGroupClaim - if (!groupClaimName) - // Allow no group claim when configured like this - return true - - // If configured it must exist in userinfo - if (!userinfo[groupClaimName]) { - return false - } - return true - } - - /** - * Sets the user group based on group claim in userinfo. - * @param {import('../models/User')} user - * @param {Object} userinfo - */ - async setUserGroup(user, userinfo) { - const groupClaimName = Database.serverSettings.authOpenIDGroupClaim - if (!groupClaimName) - // No group claim configured, don't set anything - return - - if (!userinfo[groupClaimName]) throw new Error(`Group claim ${groupClaimName} not found in userinfo`) - - const groupsList = userinfo[groupClaimName].map((group) => group.toLowerCase()) - const rolesInOrderOfPriority = ['admin', 'user', 'guest'] - - let userType = rolesInOrderOfPriority.find((role) => groupsList.includes(role)) - if (userType) { - if (user.type === 'root') { - // Check OpenID Group - if (userType !== 'admin') { - throw new Error(`Root user "${user.username}" cannot be downgraded to ${userType}. Denying login.`) - } else { - // If root user is logging in via OpenID, we will not change the type - return - } - } - - if (user.type !== userType) { - Logger.info(`[OidcAuth] openid callback: Updating user "${user.username}" type to "${userType}" from "${user.type}"`) - user.type = userType - await user.save() - } - } else { - throw new Error(`No valid group found in userinfo: ${JSON.stringify(userinfo[groupClaimName], null, 2)}`) - } - } - - /** - * Updates user permissions based on the advanced permissions claim. - * @param {import('../models/User')} user - * @param {Object} userinfo - */ - async updateUserPermissions(user, userinfo) { - const absPermissionsClaim = Database.serverSettings.authOpenIDAdvancedPermsClaim - if (!absPermissionsClaim) - // No advanced permissions claim configured, don't set anything - return - - if (user.type === 'admin' || user.type === 'root') return - - const absPermissions = userinfo[absPermissionsClaim] - if (!absPermissions) throw new Error(`Advanced permissions claim ${absPermissionsClaim} not found in userinfo`) - - if (await user.updatePermissionsFromExternalJSON(absPermissions)) { - Logger.info(`[OidcAuth] openid callback: Updating advanced perms for user "${user.username}" using "${JSON.stringify(absPermissions)}"`) - } - } - - /** - * Generate PKCE parameters for the authorization request - * @param {Request} req - * @param {boolean} isMobileFlow - * @returns {Object|{error: string}} - */ - generatePkce(req, isMobileFlow) { - if (isMobileFlow) { - if (!req.query.code_challenge) { - return { - error: 'code_challenge required for mobile flow (PKCE)' - } - } - if (req.query.code_challenge_method && req.query.code_challenge_method !== 'S256') { - return { - error: 'Only S256 code_challenge_method method supported' - } - } - return { - code_challenge: req.query.code_challenge, - code_challenge_method: req.query.code_challenge_method || 'S256' - } - } else { - const code_verifier = OpenIDClient.generators.codeVerifier() - const code_challenge = OpenIDClient.generators.codeChallenge(code_verifier) - return { code_challenge, code_challenge_method: 'S256', code_verifier } - } - } - - /** - * Check if a redirect URI is valid - * @param {string} uri - * @returns {boolean} - */ - isValidRedirectUri(uri) { - // Check if the redirect_uri is in the whitelist - return Database.serverSettings.authOpenIDMobileRedirectURIs.includes(uri) || (Database.serverSettings.authOpenIDMobileRedirectURIs.length === 1 && Database.serverSettings.authOpenIDMobileRedirectURIs[0] === '*') - } - - /** - * Get the authorization URL for OpenID Connect - * Calls client manually because the strategy does not support forwarding the code challenge for the mobile flow - * @param {Request} req - * @returns {{ authorizationUrl: string }|{status: number, error: string}} - */ - getAuthorizationUrl(req) { - const client = this.getClient() - const strategy = this.getStrategy() - const sessionKey = strategy._key - - try { - const protocol = req.secure || req.get('x-forwarded-proto') === 'https' ? 'https' : 'http' - const hostUrl = new URL(`${protocol}://${req.get('host')}`) - const isMobileFlow = req.query.response_type === 'code' || req.query.redirect_uri || req.query.code_challenge - - // Only allow code flow (for mobile clients) - if (req.query.response_type && req.query.response_type !== 'code') { - Logger.debug(`[OidcAuth] OIDC Invalid response_type=${req.query.response_type}`) - return { - status: 400, - error: 'Invalid response_type, only code supported' - } - } - - // Generate a state on web flow or if no state supplied - const state = !isMobileFlow || !req.query.state ? OpenIDClient.generators.random() : req.query.state - - // Redirect URL for the SSO provider - let redirectUri - if (isMobileFlow) { - // Mobile required redirect uri - // If it is in the whitelist, we will save into this.openIdAuthSession and set the redirect uri to /auth/openid/mobile-redirect - // where we will handle the redirect to it - if (!req.query.redirect_uri || !this.isValidRedirectUri(req.query.redirect_uri)) { - Logger.debug(`[OidcAuth] Invalid redirect_uri=${req.query.redirect_uri}`) - return { - status: 400, - error: 'Invalid redirect_uri' - } - } - // We cannot save the supplied redirect_uri in the session, because it the mobile client uses browser instead of the API - // for the request to mobile-redirect and as such the session is not shared - this.openIdAuthSession.set(state, { mobile_redirect_uri: req.query.redirect_uri }) - - redirectUri = new URL(`${global.ServerSettings.authOpenIDSubfolderForRedirectURLs}/auth/openid/mobile-redirect`, hostUrl).toString() - } else { - redirectUri = new URL(`${global.ServerSettings.authOpenIDSubfolderForRedirectURLs}/auth/openid/callback`, hostUrl).toString() - - if (req.query.state) { - Logger.debug(`[OidcAuth] Invalid state - not allowed on web openid flow`) - return { - status: 400, - error: 'Invalid state, not allowed on web flow' - } - } - } - - // Update the strategy's redirect_uri for this request - strategy._params.redirect_uri = redirectUri - Logger.debug(`[OidcAuth] OIDC redirect_uri=${redirectUri}`) - - const pkceData = this.generatePkce(req, isMobileFlow) - if (pkceData.error) { - return { - status: 400, - error: pkceData.error - } - } - - req.session[sessionKey] = { - ...req.session[sessionKey], - state: state, - max_age: strategy._params.max_age, - response_type: 'code', - code_verifier: pkceData.code_verifier, // not null if web flow - mobile: req.query.redirect_uri, // Used in the abs callback later, set mobile if redirect_uri is filled out - sso_redirect_uri: redirectUri // Save the redirect_uri (for the SSO Provider) for the callback - } - - const authorizationUrl = client.authorizationUrl({ - ...strategy._params, - redirect_uri: redirectUri, - state: state, - response_type: 'code', - scope: this.getScope(), - code_challenge: pkceData.code_challenge, - code_challenge_method: pkceData.code_challenge_method - }) - - return { - authorizationUrl, - isMobileFlow - } - } catch (error) { - Logger.error(`[OidcAuth] Error generating authorization URL: ${error}\n${error?.stack}`) - return { - status: 500, - error: error.message || 'Unknown error' - } - } - } - - /** - * Get the end session URL for logout - * @param {Request} req - * @param {string} idToken - * @param {string} authMethod - * @returns {string|null} - */ - getEndSessionUrl(req, idToken, authMethod) { - const client = this.getClient() - - if (client.issuer.end_session_endpoint && client.issuer.end_session_endpoint.length > 0) { - let postLogoutRedirectUri = null - - if (authMethod === 'openid') { - const protocol = req.secure || req.get('x-forwarded-proto') === 'https' ? 'https' : 'http' - const host = req.get('host') - // TODO: ABS does currently not support subfolders for installation - // If we want to support it we need to include a config for the serverurl - postLogoutRedirectUri = `${protocol}://${host}${global.RouterBasePath}/login` - } - // else for openid-mobile we keep postLogoutRedirectUri on null - // nice would be to redirect to the app here, but for example Authentik does not implement - // the post_logout_redirect_uri parameter at all and for other providers - // we would also need again to implement (and even before get to know somehow for 3rd party apps) - // the correct app link like audiobookshelf://login (and maybe also provide a redirect like mobile-redirect). - // Instead because its null (and this way the parameter will be omitted completly), the client/app can simply append something like - // &post_logout_redirect_uri=audiobookshelf://login to the received logout url by itself which is the simplest solution - // (The URL needs to be whitelisted in the config of the SSO/ID provider) - - return client.endSessionUrl({ - id_token_hint: idToken, - post_logout_redirect_uri: postLogoutRedirectUri - }) - } - - return null - } - - /** - * @typedef {Object} OpenIdIssuerConfig - * @property {string} issuer - * @property {string} authorization_endpoint - * @property {string} token_endpoint - * @property {string} userinfo_endpoint - * @property {string} end_session_endpoint - * @property {string} jwks_uri - * @property {string} id_token_signing_alg_values_supported - * - * Get OpenID Connect configuration from an issuer URL - * @param {string} issuerUrl - * @returns {Promise} - */ - async getIssuerConfig(issuerUrl) { - // Strip trailing slash - if (issuerUrl.endsWith('/')) issuerUrl = issuerUrl.slice(0, -1) - - // Append config pathname and validate URL - let configUrl = null - try { - configUrl = new URL(`${issuerUrl}/.well-known/openid-configuration`) - if (!configUrl.pathname.endsWith('/.well-known/openid-configuration')) { - throw new Error('Invalid pathname') - } - } catch (error) { - Logger.error(`[OidcAuth] Failed to get openid configuration. Invalid URL "${configUrl}"`, error) - return { - status: 400, - error: "Invalid request. Query param 'issuer' is invalid" - } - } - - try { - const { data } = await axios.get(configUrl.toString()) - return { - issuer: data.issuer, - authorization_endpoint: data.authorization_endpoint, - token_endpoint: data.token_endpoint, - userinfo_endpoint: data.userinfo_endpoint, - end_session_endpoint: data.end_session_endpoint, - jwks_uri: data.jwks_uri, - id_token_signing_alg_values_supported: data.id_token_signing_alg_values_supported - } - } catch (error) { - Logger.error(`[OidcAuth] Failed to get openid configuration at "${configUrl}"`, error) - return { - status: 400, - error: 'Failed to get openid configuration' - } - } - } - - /** - * Handle mobile redirect for OAuth2 callback - * @param {Request} req - * @param {Response} res - */ - handleMobileRedirect(req, res) { - try { - // Extract the state parameter from the request - const { state, code } = req.query - - // Check if the state provided is in our list - if (!state || !this.openIdAuthSession.has(state)) { - Logger.error('[OidcAuth] /auth/openid/mobile-redirect route: State parameter mismatch') - return res.status(400).send('State parameter mismatch') - } - - let mobile_redirect_uri = this.openIdAuthSession.get(state).mobile_redirect_uri - - if (!mobile_redirect_uri) { - Logger.error('[OidcAuth] No redirect URI') - return res.status(400).send('No redirect URI') - } - - this.openIdAuthSession.delete(state) - - const redirectUri = `${mobile_redirect_uri}?code=${encodeURIComponent(code)}&state=${encodeURIComponent(state)}` - // Redirect to the overwrite URI saved in the map - res.redirect(redirectUri) - } catch (error) { - Logger.error(`[OidcAuth] Error in /auth/openid/mobile-redirect route: ${error}\n${error?.stack}`) - res.status(500).send('Internal Server Error') - } - } -} - -module.exports = OidcAuthStrategy diff --git a/server/auth/TokenManager.js b/server/auth/TokenManager.js deleted file mode 100644 index 65ae32b18..000000000 --- a/server/auth/TokenManager.js +++ /dev/null @@ -1,406 +0,0 @@ -const { Op } = require('sequelize') - -const Database = require('../Database') -const Logger = require('../Logger') - -const requestIp = require('../libs/requestIp') -const jwt = require('../libs/jsonwebtoken') - -class TokenManager { - /** @type {string} JWT secret key */ - static TokenSecret = null - - constructor() { - /** @type {number} Refresh token expiry in seconds */ - this.RefreshTokenExpiry = parseInt(process.env.REFRESH_TOKEN_EXPIRY) || 7 * 24 * 60 * 60 // 7 days - /** @type {number} Access token expiry in seconds */ - this.AccessTokenExpiry = parseInt(process.env.ACCESS_TOKEN_EXPIRY) || 12 * 60 * 60 // 12 hours - - if (parseInt(process.env.REFRESH_TOKEN_EXPIRY) > 0) { - Logger.info(`[TokenManager] Refresh token expiry set from ENV variable to ${this.RefreshTokenExpiry} seconds`) - } - if (parseInt(process.env.ACCESS_TOKEN_EXPIRY) > 0) { - Logger.info(`[TokenManager] Access token expiry set from ENV variable to ${this.AccessTokenExpiry} seconds`) - } - } - - get TokenSecret() { - return TokenManager.TokenSecret - } - - /** - * Token secret is used to sign and verify JWTs - * Set by ENV variable "JWT_SECRET_KEY" or generated and stored on server settings if not set - */ - async initTokenSecret() { - if (process.env.JWT_SECRET_KEY) { - // Use user supplied token secret - Logger.info('[TokenManager] JWT secret key set from ENV variable') - TokenManager.TokenSecret = process.env.JWT_SECRET_KEY - } else if (!Database.serverSettings.tokenSecret) { - // Generate new token secret and store it on server settings - Logger.info('[TokenManager] JWT secret key not found, generating one') - TokenManager.TokenSecret = require('crypto').randomBytes(256).toString('base64') - Database.serverSettings.tokenSecret = TokenManager.TokenSecret - await Database.updateServerSettings() - } else { - // Use existing token secret from server settings - TokenManager.TokenSecret = Database.serverSettings.tokenSecret - } - } - - /** - * Sets the refresh token cookie - * @param {import('express').Request} req - * @param {import('express').Response} res - * @param {string} refreshToken - */ - setRefreshTokenCookie(req, res, refreshToken) { - res.cookie('refresh_token', refreshToken, { - httpOnly: true, - secure: req.secure || req.get('x-forwarded-proto') === 'https', - sameSite: 'lax', - maxAge: this.RefreshTokenExpiry * 1000, - path: '/' - }) - } - - /** - * Function to validate a jwt token for a given user - * Used to authenticate socket connections - * TODO: Support API keys for web socket connections - * - * @param {string} token - * @returns {Object} tokens data - */ - static validateAccessToken(token) { - try { - return jwt.verify(token, TokenManager.TokenSecret) - } catch (err) { - return null - } - } - - /** - * Function to generate a jwt token for a given user - * TODO: Old method with no expiration - * @deprecated - * - * @param {{ id:string, username:string }} user - * @returns {string} - */ - generateAccessToken(user) { - return jwt.sign({ userId: user.id, username: user.username }, TokenManager.TokenSecret) - } - - /** - * Generate access token for a given user - * - * @param {{ id:string, username:string }} user - * @returns {string} - */ - generateTempAccessToken(user) { - const payload = { - userId: user.id, - username: user.username, - type: 'access' - } - const options = { - expiresIn: this.AccessTokenExpiry - } - try { - return jwt.sign(payload, TokenManager.TokenSecret, options) - } catch (error) { - Logger.error(`[TokenManager] Error generating access token for user ${user.id}: ${error}`) - return null - } - } - - /** - * Generate refresh token for a given user - * - * @param {{ id:string, username:string }} user - * @returns {string} - */ - generateRefreshToken(user) { - const payload = { - userId: user.id, - username: user.username, - type: 'refresh' - } - const options = { - expiresIn: this.RefreshTokenExpiry - } - try { - return jwt.sign(payload, TokenManager.TokenSecret, options) - } catch (error) { - Logger.error(`[TokenManager] Error generating refresh token for user ${user.id}: ${error}`) - return null - } - } - - /** - * Create tokens and session for a given user - * - * @param {{ id:string, username:string }} user - * @param {import('express').Request} req - * @returns {Promise<{ accessToken:string, refreshToken:string, session:import('../models/Session') }>} - */ - async createTokensAndSession(user, req) { - const ipAddress = requestIp.getClientIp(req) - const userAgent = req.headers['user-agent'] - const accessToken = this.generateTempAccessToken(user) - const refreshToken = this.generateRefreshToken(user) - - // Calculate expiration time for the refresh token - const expiresAt = new Date(Date.now() + this.RefreshTokenExpiry * 1000) - - const session = await Database.sessionModel.createSession(user.id, ipAddress, userAgent, refreshToken, expiresAt) - - return { - accessToken, - refreshToken, - session - } - } - - /** - * Rotate tokens for a given session - * - * @param {import('../models/Session')} session - * @param {import('../models/User')} user - * @param {import('express').Request} req - * @param {import('express').Response} res - * @returns {Promise<{ accessToken:string, refreshToken:string }>} - */ - async rotateTokensForSession(session, user, req, res) { - // Generate new tokens - const newAccessToken = this.generateTempAccessToken(user) - const newRefreshToken = this.generateRefreshToken(user) - - // Calculate new expiration time - const newExpiresAt = new Date(Date.now() + this.RefreshTokenExpiry * 1000) - - // Update the session with the new refresh token and expiration - session.refreshToken = newRefreshToken - session.expiresAt = newExpiresAt - await session.save() - - // Set new refresh token cookie - this.setRefreshTokenCookie(req, res, newRefreshToken) - - return { - accessToken: newAccessToken, - refreshToken: newRefreshToken - } - } - - /** - * Check if the jwt is valid - * - * @param {Object} jwt_payload - * @param {Function} done - passportjs callback - */ - async jwtAuthCheck(jwt_payload, done) { - if (jwt_payload.type === 'api') { - // Api key based authentication - const apiKey = await Database.apiKeyModel.getById(jwt_payload.keyId) - - if (!apiKey?.isActive) { - done(null, null) - return - } - - // Check if the api key is expired and deactivate it - if (jwt_payload.exp && jwt_payload.exp < Date.now() / 1000) { - done(null, null) - - apiKey.isActive = false - await apiKey.save() - Logger.info(`[TokenManager] API key ${apiKey.id} is expired - deactivated`) - return - } - - const user = await Database.userModel.getUserById(apiKey.userId) - done(null, user) - } else { - // JWT based authentication - - // Check if the jwt is expired - if (jwt_payload.exp && jwt_payload.exp < Date.now() / 1000) { - done(null, null) - return - } - - // load user by id from the jwt token - const user = await Database.userModel.getUserByIdOrOldId(jwt_payload.userId) - - if (!user?.isActive) { - // deny login - done(null, null) - return - } - - // TODO: Temporary flag to report old tokens to users - // May be a better place for this but here means we dont have to decode the token again - if (!jwt_payload.exp && !user.isOldToken) { - Logger.debug(`[TokenManager] User ${user.username} is using an access token without an expiration`) - user.isOldToken = true - } else if (jwt_payload.exp && user.isOldToken !== undefined) { - delete user.isOldToken - } - - // approve login - done(null, user) - } - } - - /** - * Handle refresh token - * - * @param {string} refreshToken - * @param {import('express').Request} req - * @param {import('express').Response} res - * @returns {Promise<{ accessToken?:string, refreshToken?:string, user?:import('../models/User'), error?:string }>} - */ - async handleRefreshToken(refreshToken, req, res) { - try { - // Verify the refresh token - const decoded = jwt.verify(refreshToken, TokenManager.TokenSecret) - - if (decoded.type !== 'refresh') { - Logger.error(`[TokenManager] Failed to refresh token. Invalid token type: ${decoded.type}`) - return { - error: 'Invalid token type' - } - } - - const session = await Database.sessionModel.findOne({ - where: { refreshToken: refreshToken } - }) - - if (!session) { - Logger.error(`[TokenManager] Failed to refresh token. Session not found for refresh token: ${refreshToken}`) - return { - error: 'Invalid refresh token' - } - } - - // Check if session is expired in database - if (session.expiresAt < new Date()) { - Logger.info(`[TokenManager] Session expired in database, cleaning up`) - await session.destroy() - return { - error: 'Refresh token expired' - } - } - - const user = await Database.userModel.getUserById(decoded.userId) - if (!user?.isActive) { - Logger.error(`[TokenManager] Failed to refresh token. User not found or inactive for user id: ${decoded.userId}`) - return { - error: 'User not found or inactive' - } - } - - const newTokens = await this.rotateTokensForSession(session, user, req, res) - return { - accessToken: newTokens.accessToken, - refreshToken: newTokens.refreshToken, - user - } - } catch (error) { - if (error.name === 'TokenExpiredError') { - Logger.info(`[TokenManager] Refresh token expired, cleaning up session`) - - // Clean up the expired session from database - try { - await Database.sessionModel.destroy({ - where: { refreshToken: refreshToken } - }) - Logger.info(`[TokenManager] Expired session cleaned up`) - } catch (cleanupError) { - Logger.error(`[TokenManager] Error cleaning up expired session: ${cleanupError.message}`) - } - - return { - error: 'Refresh token expired' - } - } else if (error.name === 'JsonWebTokenError') { - Logger.error(`[TokenManager] Invalid refresh token format: ${error.message}`) - return { - error: 'Invalid refresh token' - } - } else { - Logger.error(`[TokenManager] Refresh token error: ${error.message}`) - return { - error: 'Invalid refresh token' - } - } - } - } - - /** - * Invalidate all JWT sessions for a given user - * If user is current user and refresh token is valid, rotate tokens for the current session - * - * @param {import('../models/User')} user - * @param {import('express').Request} req - * @param {import('express').Response} res - * @returns {Promise} accessToken only if user is current user and refresh token is valid - */ - async invalidateJwtSessionsForUser(user, req, res) { - const currentRefreshToken = req.cookies.refresh_token - if (req.user.id === user.id && currentRefreshToken) { - // Current user is the same as the user to invalidate sessions for - // So rotate token for current session - const currentSession = await Database.sessionModel.findOne({ where: { refreshToken: currentRefreshToken } }) - if (currentSession) { - const newTokens = await this.rotateTokensForSession(currentSession, user, req, res) - - // Invalidate all sessions for the user except the current one - await Database.sessionModel.destroy({ - where: { - id: { - [Op.ne]: currentSession.id - }, - userId: user.id - } - }) - - return newTokens.accessToken - } else { - Logger.error(`[TokenManager] No session found to rotate tokens for refresh token ${currentRefreshToken}`) - } - } - - // Current user is not the same as the user to invalidate sessions for (or no refresh token) - // So invalidate all sessions for the user - await Database.sessionModel.destroy({ where: { userId: user.id } }) - return null - } - - /** - * Invalidate a refresh token - used for logout - * - * @param {string} refreshToken - * @returns {Promise} - */ - async invalidateRefreshToken(refreshToken) { - if (!refreshToken) { - Logger.error(`[TokenManager] No refresh token provided to invalidate`) - return false - } - - try { - const numDeleted = await Database.sessionModel.destroy({ where: { refreshToken: refreshToken } }) - Logger.info(`[TokenManager] Refresh token ${refreshToken} invalidated, ${numDeleted} sessions deleted`) - return true - } catch (error) { - Logger.error(`[TokenManager] Error invalidating refresh token: ${error.message}`) - return false - } - } -} - -module.exports = TokenManager diff --git a/server/controllers/ApiKeyController.js b/server/controllers/ApiKeyController.js deleted file mode 100644 index c09d07363..000000000 --- a/server/controllers/ApiKeyController.js +++ /dev/null @@ -1,207 +0,0 @@ -const { Request, Response, NextFunction } = require('express') -const uuidv4 = require('uuid').v4 -const Logger = require('../Logger') -const Database = require('../Database') - -/** - * @typedef RequestUserObject - * @property {import('../models/User')} user - * - * @typedef {Request & RequestUserObject} RequestWithUser - */ - -class ApiKeyController { - constructor() {} - - /** - * GET: /api/api-keys - * - * @param {RequestWithUser} req - * @param {Response} res - */ - async getAll(req, res) { - const apiKeys = await Database.apiKeyModel.findAll({ - include: [ - { - model: Database.userModel, - attributes: ['id', 'username', 'type'] - }, - { - model: Database.userModel, - as: 'createdByUser', - attributes: ['id', 'username', 'type'] - } - ] - }) - - return res.json({ - apiKeys: apiKeys.map((a) => a.toJSON()) - }) - } - - /** - * POST: /api/api-keys - * - * @this {import('../routers/ApiRouter')} - * - * @param {RequestWithUser} req - * @param {Response} res - */ - async create(req, res) { - if (!req.body.name || typeof req.body.name !== 'string') { - Logger.warn(`[ApiKeyController] create: Invalid name: ${req.body.name}`) - return res.sendStatus(400) - } - if (req.body.expiresIn && (typeof req.body.expiresIn !== 'number' || req.body.expiresIn <= 0)) { - Logger.warn(`[ApiKeyController] create: Invalid expiresIn: ${req.body.expiresIn}`) - return res.sendStatus(400) - } - if (!req.body.userId || typeof req.body.userId !== 'string') { - Logger.warn(`[ApiKeyController] create: Invalid userId: ${req.body.userId}`) - return res.sendStatus(400) - } - const user = await Database.userModel.getUserById(req.body.userId) - if (!user) { - Logger.warn(`[ApiKeyController] create: User not found: ${req.body.userId}`) - return res.sendStatus(400) - } - if (user.type === 'root' && !req.user.isRoot) { - Logger.warn(`[ApiKeyController] create: Root user API key cannot be created by non-root user`) - return res.sendStatus(403) - } - - const keyId = uuidv4() // Generate key id ahead of time to use in JWT - const apiKey = await Database.apiKeyModel.generateApiKey(this.auth.tokenManager.TokenSecret, keyId, req.body.name, req.body.expiresIn) - - if (!apiKey) { - Logger.error(`[ApiKeyController] create: Error generating API key`) - return res.sendStatus(500) - } - - // Calculate expiration time for the api key - const expiresAt = req.body.expiresIn ? new Date(Date.now() + req.body.expiresIn * 1000) : null - - const apiKeyInstance = await Database.apiKeyModel.create({ - id: keyId, - name: req.body.name, - expiresAt, - userId: req.body.userId, - isActive: !!req.body.isActive, - createdByUserId: req.user.id - }) - apiKeyInstance.dataValues.user = await apiKeyInstance.getUser({ - attributes: ['id', 'username', 'type'] - }) - - Logger.info(`[ApiKeyController] Created API key "${apiKeyInstance.name}"`) - return res.json({ - apiKey: { - apiKey, // Actual key only shown to user on creation - ...apiKeyInstance.toJSON() - } - }) - } - - /** - * PATCH: /api/api-keys/:id - * Only isActive and userId can be updated because name and expiresIn are in the JWT - * - * @param {RequestWithUser} req - * @param {Response} res - */ - async update(req, res) { - const apiKey = await Database.apiKeyModel.findByPk(req.params.id, { - include: { - model: Database.userModel - } - }) - if (!apiKey) { - return res.sendStatus(404) - } - // Only root user can update root user API keys - if (apiKey.user.type === 'root' && !req.user.isRoot) { - Logger.warn(`[ApiKeyController] update: Root user API key cannot be updated by non-root user`) - return res.sendStatus(403) - } - - let hasUpdates = false - if (req.body.userId !== undefined) { - if (typeof req.body.userId !== 'string') { - Logger.warn(`[ApiKeyController] update: Invalid userId: ${req.body.userId}`) - return res.sendStatus(400) - } - const user = await Database.userModel.getUserById(req.body.userId) - if (!user) { - Logger.warn(`[ApiKeyController] update: User not found: ${req.body.userId}`) - return res.sendStatus(400) - } - if (user.type === 'root' && !req.user.isRoot) { - Logger.warn(`[ApiKeyController] update: Root user API key cannot be created by non-root user`) - return res.sendStatus(403) - } - if (apiKey.userId !== req.body.userId) { - apiKey.userId = req.body.userId - hasUpdates = true - } - } - - if (req.body.isActive !== undefined) { - if (typeof req.body.isActive !== 'boolean') { - return res.sendStatus(400) - } - if (apiKey.isActive !== req.body.isActive) { - apiKey.isActive = req.body.isActive - hasUpdates = true - } - } - - if (hasUpdates) { - await apiKey.save() - apiKey.dataValues.user = await apiKey.getUser({ - attributes: ['id', 'username', 'type'] - }) - Logger.info(`[ApiKeyController] Updated API key "${apiKey.name}"`) - } else { - Logger.info(`[ApiKeyController] No updates needed to API key "${apiKey.name}"`) - } - - return res.json({ - apiKey: apiKey.toJSON() - }) - } - - /** - * DELETE: /api/api-keys/:id - * - * @param {RequestWithUser} req - * @param {Response} res - */ - async delete(req, res) { - const apiKey = await Database.apiKeyModel.findByPk(req.params.id) - if (!apiKey) { - return res.sendStatus(404) - } - - await apiKey.destroy() - Logger.info(`[ApiKeyController] Deleted API key "${apiKey.name}"`) - - return res.sendStatus(200) - } - - /** - * - * @param {RequestWithUser} req - * @param {Response} res - * @param {NextFunction} next - */ - middleware(req, res, next) { - if (!req.user.isAdminOrUp) { - Logger.error(`[ApiKeyController] Non-admin user "${req.user.username}" attempting to access api keys`) - return res.sendStatus(403) - } - - next() - } -} - -module.exports = new ApiKeyController() diff --git a/server/controllers/MeController.js b/server/controllers/MeController.js index 9451a7654..87acd2211 100644 --- a/server/controllers/MeController.js +++ b/server/controllers/MeController.js @@ -273,24 +273,12 @@ class MeController { * @param {RequestWithUser} req * @param {Response} res */ - async updatePassword(req, res) { + updatePassword(req, res) { if (req.user.isGuest) { Logger.error(`[MeController] Guest user "${req.user.username}" attempted to change password`) - return res.sendStatus(403) + return res.sendStatus(500) } - - const { password, newPassword } = req.body - if (!password || !newPassword || typeof password !== 'string' || typeof newPassword !== 'string') { - return res.status(400).send('Missing or invalid password or new password') - } - - const result = await this.auth.localAuthStrategy.changePassword(req.user, password, newPassword) - - if (result.error) { - return res.status(400).send(result.error) - } - - res.sendStatus(200) + this.auth.userChangePassword(req, res) } /** diff --git a/server/controllers/UserController.js b/server/controllers/UserController.js index e72293cb3..0fb105133 100644 --- a/server/controllers/UserController.js +++ b/server/controllers/UserController.js @@ -127,8 +127,8 @@ class UserController { } const userId = uuidv4() - const pash = await this.auth.localAuthStrategy.hashPassword(req.body.password) - const token = this.auth.generateAccessToken({ id: userId, username: req.body.username }) + const pash = await this.auth.hashPass(req.body.password) + const token = await this.auth.generateAccessToken({ id: userId, username: req.body.username }) const userType = req.body.type || 'user' // librariesAccessible and itemTagsSelected can be on req.body or req.body.permissions @@ -237,7 +237,6 @@ class UserController { let hasUpdates = false let shouldUpdateToken = false - let shouldInvalidateJwtSessions = false // When changing username create a new API token if (updatePayload.username && updatePayload.username !== user.username) { const usernameExists = await Database.userModel.checkUserExistsWithUsername(updatePayload.username) @@ -246,13 +245,12 @@ class UserController { } user.username = updatePayload.username shouldUpdateToken = true - shouldInvalidateJwtSessions = true hasUpdates = true } // Updating password if (updatePayload.password) { - user.pash = await this.auth.localAuthStrategy.hashPassword(updatePayload.password) + user.pash = await this.auth.hashPass(updatePayload.password) hasUpdates = true } @@ -327,24 +325,9 @@ class UserController { if (hasUpdates) { if (shouldUpdateToken) { - user.token = this.auth.generateAccessToken(user) + user.token = await this.auth.generateAccessToken(user) Logger.info(`[UserController] User ${user.username} has generated a new api token`) } - - // Handle JWT session invalidation for username changes - if (shouldInvalidateJwtSessions) { - const newAccessToken = await this.auth.invalidateJwtSessionsForUser(user, req, res) - if (newAccessToken) { - user.accessToken = newAccessToken - // Refresh tokens are only returned for mobile clients - // Mobile apps currently do not use this API endpoint so always set to null - user.refreshToken = null - Logger.info(`[UserController] Invalidated JWT sessions for user ${user.username} and rotated tokens for current session`) - } else { - Logger.info(`[UserController] Invalidated JWT sessions for user ${user.username}`) - } - } - await user.save() SocketAuthority.clientEmitter(req.user.id, 'user_updated', user.toOldJSONForBrowser()) } diff --git a/server/managers/CronManager.js b/server/managers/CronManager.js index d3e652129..3f9485838 100644 --- a/server/managers/CronManager.js +++ b/server/managers/CronManager.js @@ -31,12 +31,10 @@ class CronManager { } /** - * Initialize open session & auth session cleanup cron + * Initialize open session cleanup cron * Runs every day at 00:30 * Closes open share sessions that have not been updated in 24 hours * Closes open playback sessions that have not been updated in 36 hours - * Cleans up expired auth sessions - * Deactivates expired api keys * TODO: Clients should re-open the session if it is closed so that stale sessions can be closed sooner */ initOpenSessionCleanupCron() { @@ -44,8 +42,6 @@ class CronManager { Logger.debug('[CronManager] Open session cleanup cron executing') ShareManager.closeStaleOpenShareSessions() await this.playbackSessionManager.closeStaleOpenSessions() - await Database.cleanupExpiredSessions() - await Database.deactivateExpiredApiKeys() }) } diff --git a/server/migrations/v2.26.0-create-auth-tables.js b/server/migrations/v2.26.0-create-auth-tables.js deleted file mode 100644 index a14804623..000000000 --- a/server/migrations/v2.26.0-create-auth-tables.js +++ /dev/null @@ -1,163 +0,0 @@ -/** - * @typedef MigrationContext - * @property {import('sequelize').QueryInterface} queryInterface - a suquelize QueryInterface object. - * @property {import('../Logger')} logger - a Logger object. - * - * @typedef MigrationOptions - * @property {MigrationContext} context - an object containing the migration context. - */ - -const migrationVersion = '2.26.0' -const migrationName = `${migrationVersion}-create-auth-tables` -const loggerPrefix = `[${migrationVersion} migration]` - -/** - * This upward migration creates a sessions table and apiKeys table. - * - * @param {MigrationOptions} options - an object containing the migration context. - * @returns {Promise} - A promise that resolves when the migration is complete. - */ -async function up({ context: { queryInterface, logger } }) { - // Upwards migration script - logger.info(`${loggerPrefix} UPGRADE BEGIN: ${migrationName}`) - - // Check if table exists - if (await queryInterface.tableExists('sessions')) { - logger.info(`${loggerPrefix} table "sessions" already exists`) - } else { - // Create table - logger.info(`${loggerPrefix} creating table "sessions"`) - const DataTypes = queryInterface.sequelize.Sequelize.DataTypes - await queryInterface.createTable('sessions', { - id: { - type: DataTypes.UUID, - defaultValue: DataTypes.UUIDV4, - primaryKey: true - }, - ipAddress: DataTypes.STRING, - userAgent: DataTypes.STRING, - refreshToken: { - type: DataTypes.STRING, - allowNull: false - }, - expiresAt: { - type: DataTypes.DATE, - allowNull: false - }, - createdAt: { - type: DataTypes.DATE, - allowNull: false - }, - updatedAt: { - type: DataTypes.DATE, - allowNull: false - }, - userId: { - type: DataTypes.UUID, - references: { - model: { - tableName: 'users' - }, - key: 'id' - }, - allowNull: false, - onDelete: 'CASCADE' - } - }) - logger.info(`${loggerPrefix} created table "sessions"`) - } - - // Check if table exists - if (await queryInterface.tableExists('apiKeys')) { - logger.info(`${loggerPrefix} table "apiKeys" already exists`) - } else { - // Create table - logger.info(`${loggerPrefix} creating table "apiKeys"`) - const DataTypes = queryInterface.sequelize.Sequelize.DataTypes - await queryInterface.createTable('apiKeys', { - id: { - type: DataTypes.UUID, - defaultValue: DataTypes.UUIDV4, - primaryKey: true - }, - name: { - type: DataTypes.STRING, - allowNull: false - }, - description: DataTypes.TEXT, - expiresAt: DataTypes.DATE, - lastUsedAt: DataTypes.DATE, - isActive: { - type: DataTypes.BOOLEAN, - allowNull: false, - defaultValue: false - }, - permissions: DataTypes.JSON, - createdAt: { - type: DataTypes.DATE, - allowNull: false - }, - updatedAt: { - type: DataTypes.DATE, - allowNull: false - }, - userId: { - type: DataTypes.UUID, - references: { - model: { - tableName: 'users' - }, - key: 'id' - }, - onDelete: 'CASCADE' - }, - createdByUserId: { - type: DataTypes.UUID, - references: { - model: { - tableName: 'users', - as: 'createdByUser' - }, - key: 'id' - }, - onDelete: 'SET NULL' - } - }) - logger.info(`${loggerPrefix} created table "apiKeys"`) - } - - logger.info(`${loggerPrefix} UPGRADE END: ${migrationName}`) -} - -/** - * This downward migration script removes the sessions table and apiKeys table. - * - * @param {MigrationOptions} options - an object containing the migration context. - * @returns {Promise} - A promise that resolves when the migration is complete. - */ -async function down({ context: { queryInterface, logger } }) { - // Downward migration script - logger.info(`${loggerPrefix} DOWNGRADE BEGIN: ${migrationName}`) - - // Check if table exists - if (await queryInterface.tableExists('sessions')) { - logger.info(`${loggerPrefix} dropping table "sessions"`) - // Drop table - await queryInterface.dropTable('sessions') - logger.info(`${loggerPrefix} dropped table "sessions"`) - } else { - logger.info(`${loggerPrefix} table "sessions" does not exist`) - } - - if (await queryInterface.tableExists('apiKeys')) { - logger.info(`${loggerPrefix} dropping table "apiKeys"`) - await queryInterface.dropTable('apiKeys') - logger.info(`${loggerPrefix} dropped table "apiKeys"`) - } else { - logger.info(`${loggerPrefix} table "apiKeys" does not exist`) - } - - logger.info(`${loggerPrefix} DOWNGRADE END: ${migrationName}`) -} - -module.exports = { up, down } diff --git a/server/models/ApiKey.js b/server/models/ApiKey.js deleted file mode 100644 index 7c61611d7..000000000 --- a/server/models/ApiKey.js +++ /dev/null @@ -1,272 +0,0 @@ -const { DataTypes, Model, Op } = require('sequelize') -const jwt = require('jsonwebtoken') -const { LRUCache } = require('lru-cache') -const Logger = require('../Logger') - -/** - * @typedef {Object} ApiKeyPermissions - * @property {boolean} download - * @property {boolean} update - * @property {boolean} delete - * @property {boolean} upload - * @property {boolean} createEreader - * @property {boolean} accessAllLibraries - * @property {boolean} accessAllTags - * @property {boolean} accessExplicitContent - * @property {boolean} selectedTagsNotAccessible - * @property {string[]} librariesAccessible - * @property {string[]} itemTagsSelected - */ - -class ApiKeyCache { - constructor() { - this.cache = new LRUCache({ max: 100 }) - } - - getById(id) { - const apiKey = this.cache.get(id) - return apiKey - } - - set(apiKey) { - apiKey.fromCache = true - this.cache.set(apiKey.id, apiKey) - } - - delete(apiKeyId) { - this.cache.delete(apiKeyId) - } - - maybeInvalidate(apiKey) { - if (!apiKey.fromCache) this.delete(apiKey.id) - } -} - -const apiKeyCache = new ApiKeyCache() - -class ApiKey extends Model { - constructor(values, options) { - super(values, options) - - /** @type {UUIDV4} */ - this.id - /** @type {string} */ - this.name - /** @type {string} */ - this.description - /** @type {Date} */ - this.expiresAt - /** @type {Date} */ - this.lastUsedAt - /** @type {boolean} */ - this.isActive - /** @type {ApiKeyPermissions} */ - this.permissions - /** @type {Date} */ - this.createdAt - /** @type {Date} */ - this.updatedAt - /** @type {UUIDV4} */ - this.userId - /** @type {UUIDV4} */ - this.createdByUserId - - // Expanded properties - - /** @type {import('./User').User} */ - this.user - } - - /** - * Same properties as User.getDefaultPermissions - * @returns {ApiKeyPermissions} - */ - static getDefaultPermissions() { - return { - download: true, - update: true, - delete: true, - upload: true, - createEreader: true, - accessAllLibraries: true, - accessAllTags: true, - accessExplicitContent: true, - selectedTagsNotAccessible: false, // Inverts itemTagsSelected - librariesAccessible: [], - itemTagsSelected: [] - } - } - - /** - * Merge permissions from request with default permissions - * @param {ApiKeyPermissions} reqPermissions - * @returns {ApiKeyPermissions} - */ - static mergePermissionsWithDefault(reqPermissions) { - const permissions = this.getDefaultPermissions() - - if (!reqPermissions || typeof reqPermissions !== 'object') { - Logger.warn(`[ApiKey] mergePermissionsWithDefault: Invalid permissions: ${reqPermissions}`) - return permissions - } - - for (const key in reqPermissions) { - if (reqPermissions[key] === undefined) { - Logger.warn(`[ApiKey] mergePermissionsWithDefault: Invalid permission key: ${key}`) - continue - } - - if (key === 'librariesAccessible' || key === 'itemTagsSelected') { - if (!Array.isArray(reqPermissions[key]) || reqPermissions[key].some((value) => typeof value !== 'string')) { - Logger.warn(`[ApiKey] mergePermissionsWithDefault: Invalid ${key} value: ${reqPermissions[key]}`) - continue - } - - permissions[key] = reqPermissions[key] - } else if (typeof reqPermissions[key] !== 'boolean') { - Logger.warn(`[ApiKey] mergePermissionsWithDefault: Invalid permission value for key ${key}. Should be boolean`) - continue - } - - permissions[key] = reqPermissions[key] - } - - return permissions - } - - /** - * Deactivate expired api keys - * @returns {Promise} Number of api keys affected - */ - static async deactivateExpiredApiKeys() { - const [affectedCount] = await ApiKey.update( - { - isActive: false - }, - { - where: { - isActive: true, - expiresAt: { - [Op.lt]: new Date() - } - } - } - ) - return affectedCount - } - - /** - * Generate a new api key - * @param {string} tokenSecret - * @param {string} keyId - * @param {string} name - * @param {number} [expiresIn] - Seconds until the api key expires or undefined for no expiration - * @returns {Promise} - */ - static async generateApiKey(tokenSecret, keyId, name, expiresIn) { - const options = {} - if (expiresIn && !isNaN(expiresIn) && expiresIn > 0) { - options.expiresIn = expiresIn - } - - return new Promise((resolve) => { - jwt.sign( - { - keyId, - name, - type: 'api' - }, - tokenSecret, - options, - (err, token) => { - if (err) { - Logger.error(`[ApiKey] Error generating API key: ${err}`) - resolve(null) - } else { - resolve(token) - } - } - ) - }) - } - - /** - * Get an api key by id, from cache or database - * @param {string} apiKeyId - * @returns {Promise} - */ - static async getById(apiKeyId) { - if (!apiKeyId) return null - - const cachedApiKey = apiKeyCache.getById(apiKeyId) - if (cachedApiKey) return cachedApiKey - - const apiKey = await ApiKey.findByPk(apiKeyId) - if (!apiKey) return null - - apiKeyCache.set(apiKey) - return apiKey - } - - /** - * Initialize model - * @param {import('../Database').sequelize} sequelize - */ - static init(sequelize) { - super.init( - { - id: { - type: DataTypes.UUID, - defaultValue: DataTypes.UUIDV4, - primaryKey: true - }, - name: { - type: DataTypes.STRING, - allowNull: false - }, - description: DataTypes.TEXT, - expiresAt: DataTypes.DATE, - lastUsedAt: DataTypes.DATE, - isActive: { - type: DataTypes.BOOLEAN, - allowNull: false, - defaultValue: false - }, - permissions: DataTypes.JSON - }, - { - sequelize, - modelName: 'apiKey' - } - ) - - const { user } = sequelize.models - user.hasMany(ApiKey, { - onDelete: 'CASCADE' - }) - ApiKey.belongsTo(user) - - user.hasMany(ApiKey, { - foreignKey: 'createdByUserId', - onDelete: 'SET NULL' - }) - ApiKey.belongsTo(user, { as: 'createdByUser', foreignKey: 'createdByUserId' }) - } - - async update(values, options) { - apiKeyCache.maybeInvalidate(this) - return await super.update(values, options) - } - - async save(options) { - apiKeyCache.maybeInvalidate(this) - return await super.save(options) - } - - async destroy(options) { - apiKeyCache.delete(this.id) - await super.destroy(options) - } -} - -module.exports = ApiKey diff --git a/server/models/Session.js b/server/models/Session.js deleted file mode 100644 index fe9dd5425..000000000 --- a/server/models/Session.js +++ /dev/null @@ -1,88 +0,0 @@ -const { DataTypes, Model, Op } = require('sequelize') - -class Session extends Model { - constructor(values, options) { - super(values, options) - - /** @type {UUIDV4} */ - this.id - /** @type {string} */ - this.ipAddress - /** @type {string} */ - this.userAgent - /** @type {Date} */ - this.createdAt - /** @type {Date} */ - this.updatedAt - /** @type {UUIDV4} */ - this.userId - /** @type {Date} */ - this.expiresAt - - // Expanded properties - - /** @type {import('./User').User} */ - this.user - } - - static async createSession(userId, ipAddress, userAgent, refreshToken, expiresAt) { - const session = await Session.create({ userId, ipAddress, userAgent, refreshToken, expiresAt }) - return session - } - - /** - * Clean up expired sessions from the database - * @returns {Promise} Number of sessions deleted - */ - static async cleanupExpiredSessions() { - const deletedCount = await Session.destroy({ - where: { - expiresAt: { - [Op.lt]: new Date() - } - } - }) - return deletedCount - } - - /** - * Initialize model - * @param {import('../Database').sequelize} sequelize - */ - static init(sequelize) { - super.init( - { - id: { - type: DataTypes.UUID, - defaultValue: DataTypes.UUIDV4, - primaryKey: true - }, - ipAddress: DataTypes.STRING, - userAgent: DataTypes.STRING, - refreshToken: { - type: DataTypes.STRING, - allowNull: false - }, - expiresAt: { - type: DataTypes.DATE, - allowNull: false - } - }, - { - sequelize, - modelName: 'session' - } - ) - - const { user } = sequelize.models - user.hasMany(Session, { - onDelete: 'CASCADE', - foreignKey: { - allowNull: false - } - }) - Session.belongsTo(user) - } -} - -module.exports = Session diff --git a/server/models/User.js b/server/models/User.js index 3f06b2389..999c80b2c 100644 --- a/server/models/User.js +++ b/server/models/User.js @@ -190,7 +190,7 @@ class User extends Model { static async createRootUser(username, pash, auth) { const userId = uuidv4() - const token = auth.generateAccessToken({ id: userId, username }) + const token = await auth.generateAccessToken({ id: userId, username }) const newUser = { id: userId, @@ -208,96 +208,6 @@ class User extends Model { return this.create(newUser) } - /** - * Finds an existing user by OpenID subject identifier, or by email/username based on server settings, - * or creates a new user if configured to do so. - * - * @param {Object} userinfo - * @param {import('../Auth')} auth - * @returns {Promise} - */ - static async findOrCreateUserFromOpenIdUserInfo(userinfo, auth) { - let user = await this.getUserByOpenIDSub(userinfo.sub) - - // Matched by sub - if (user) { - Logger.debug(`[User] openid: User found by sub`) - return user - } - - // Match existing user by email - if (global.ServerSettings.authOpenIDMatchExistingBy === 'email') { - if (userinfo.email) { - // Only disallow when email_verified explicitly set to false (allow both if not set or true) - if (userinfo.email_verified === false) { - Logger.warn(`[User] openid: User not found and email "${userinfo.email}" is not verified`) - return null - } else { - Logger.info(`[User] openid: User not found, checking existing with email "${userinfo.email}"`) - user = await this.getUserByEmail(userinfo.email) - - if (user?.authOpenIDSub) { - Logger.warn(`[User] openid: User found with email "${userinfo.email}" but is already matched with sub "${user.authOpenIDSub}"`) - return null // User is linked to a different OpenID subject; do not proceed. - } - } - } else { - Logger.warn(`[User] openid: User not found and no email in userinfo`) - // We deny login, because if the admin whishes to match email, it makes sense to require it - return null - } - } - // Match existing user by username - else if (global.ServerSettings.authOpenIDMatchExistingBy === 'username') { - let username - - if (userinfo.preferred_username) { - Logger.info(`[User] openid: User not found, checking existing with userinfo.preferred_username "${userinfo.preferred_username}"`) - username = userinfo.preferred_username - } else if (userinfo.username) { - Logger.info(`[User] openid: User not found, checking existing with userinfo.username "${userinfo.username}"`) - username = userinfo.username - } else { - Logger.warn(`[User] openid: User not found and neither preferred_username nor username in userinfo`) - return null - } - - user = await this.getUserByUsername(username) - - if (user?.authOpenIDSub) { - Logger.warn(`[User] openid: User found with username "${username}" but is already matched with sub "${user.authOpenIDSub}"`) - return null // User is linked to a different OpenID subject; do not proceed. - } - } - - // Found existing user via email or username - if (user) { - if (!user.isActive) { - Logger.warn(`[User] openid: User found but is not active`) - return null - } - - // Update user with OpenID sub - if (!user.extraData) user.extraData = {} - user.extraData.authOpenIDSub = userinfo.sub - user.changed('extraData', true) - await user.save() - - Logger.debug(`[User] openid: User found by email/username`) - return user - } - - // If no existing user was matched, auto-register if configured - if (global.ServerSettings.authOpenIDAutoRegister) { - Logger.info(`[User] openid: Auto-registering user with sub "${userinfo.sub}"`, userinfo) - user = await this.createUserFromOpenIdUserInfo(userinfo, auth) - return user - } - - Logger.warn(`[User] openid: User not found and auto-register is disabled`) - return null - } - /** * Create user from openid userinfo * @param {Object} userinfo @@ -310,7 +220,7 @@ class User extends Model { const username = userinfo.preferred_username || userinfo.name || userinfo.sub const email = userinfo.email && userinfo.email_verified ? userinfo.email : null - const token = auth.generateAccessToken({ id: userId, username }) + const token = await auth.generateAccessToken({ id: userId, username }) const newUser = { id: userId, @@ -610,11 +520,7 @@ class User extends Model { username: this.username, email: this.email, type: this.type, - // TODO: Old non-expiring token token: this.type === 'root' && hideRootToken ? '' : this.token, - // TODO: Temporary flag not saved in db that is set in Auth.js jwtAuthCheck - // Necessary to detect apps using old tokens that no longer match the old token stored on the user - isOldToken: this.isOldToken, mediaProgress: this.mediaProgresses?.map((mp) => mp.getOldMediaProgress()) || [], seriesHideFromContinueListening: [...seriesHideFromContinueListening], bookmarks: this.bookmarks?.map((b) => ({ ...b })) || [], diff --git a/server/objects/settings/ServerSettings.js b/server/objects/settings/ServerSettings.js index 4f0aa97bc..29913e449 100644 --- a/server/objects/settings/ServerSettings.js +++ b/server/objects/settings/ServerSettings.js @@ -7,7 +7,6 @@ const User = require('../../models/User') class ServerSettings { constructor(settings) { this.id = 'server-settings' - /** @type {string} JWT secret key ONLY used when JWT_SECRET_KEY is not set in ENV */ this.tokenSecret = null // Scanner diff --git a/server/routers/ApiRouter.js b/server/routers/ApiRouter.js index 6446ecc80..ecb1555f1 100644 --- a/server/routers/ApiRouter.js +++ b/server/routers/ApiRouter.js @@ -34,7 +34,6 @@ const CustomMetadataProviderController = require('../controllers/CustomMetadataP const MiscController = require('../controllers/MiscController') const ShareController = require('../controllers/ShareController') const StatsController = require('../controllers/StatsController') -const ApiKeyController = require('../controllers/ApiKeyController') class ApiRouter { constructor(Server) { @@ -182,7 +181,7 @@ class ApiRouter { this.router.post('/me/item/:id/bookmark', MeController.createBookmark.bind(this)) this.router.patch('/me/item/:id/bookmark', MeController.updateBookmark.bind(this)) this.router.delete('/me/item/:id/bookmark/:time', MeController.removeBookmark.bind(this)) - this.router.patch('/me/password', this.auth.authRateLimiter, MeController.updatePassword.bind(this)) + this.router.patch('/me/password', MeController.updatePassword.bind(this)) this.router.get('/me/items-in-progress', MeController.getAllLibraryItemsInProgress.bind(this)) this.router.get('/me/series/:id/remove-from-continue-listening', MeController.removeSeriesFromContinueListening.bind(this)) this.router.get('/me/series/:id/readd-to-continue-listening', MeController.readdSeriesFromContinueListening.bind(this)) @@ -326,14 +325,6 @@ class ApiRouter { this.router.get('/stats/year/:year', StatsController.middleware.bind(this), StatsController.getAdminStatsForYear.bind(this)) this.router.get('/stats/server', StatsController.middleware.bind(this), StatsController.getServerStats.bind(this)) - // - // API Key Routes - // - this.router.get('/api-keys', ApiKeyController.middleware.bind(this), ApiKeyController.getAll.bind(this)) - this.router.post('/api-keys', ApiKeyController.middleware.bind(this), ApiKeyController.create.bind(this)) - this.router.patch('/api-keys/:id', ApiKeyController.middleware.bind(this), ApiKeyController.update.bind(this)) - this.router.delete('/api-keys/:id', ApiKeyController.middleware.bind(this), ApiKeyController.delete.bind(this)) - // // Misc Routes // diff --git a/server/utils/rateLimiterFactory.js b/server/utils/rateLimiterFactory.js deleted file mode 100644 index e639c51c9..000000000 --- a/server/utils/rateLimiterFactory.js +++ /dev/null @@ -1,82 +0,0 @@ -const { rateLimit, RateLimitRequestHandler } = require('express-rate-limit') -const Logger = require('../Logger') -const requestIp = require('../libs/requestIp') - -/** - * Factory for creating authentication rate limiters - */ -class RateLimiterFactory { - static DEFAULT_WINDOW_MS = 10 * 60 * 1000 // 10 minutes - static DEFAULT_MAX = 40 // 40 attempts - - constructor() { - this.authRateLimiter = null - } - - /** - * Get the authentication rate limiter - * @returns {RateLimitRequestHandler} - */ - getAuthRateLimiter() { - if (this.authRateLimiter) { - return this.authRateLimiter - } - - // Disable by setting max to 0 - if (process.env.RATE_LIMIT_AUTH_MAX === '0') { - this.authRateLimiter = (req, res, next) => next() - Logger.info(`[RateLimiterFactory] Authentication rate limiting disabled by ENV variable`) - return this.authRateLimiter - } - - let windowMs = RateLimiterFactory.DEFAULT_WINDOW_MS - if (parseInt(process.env.RATE_LIMIT_AUTH_WINDOW) > 0) { - windowMs = parseInt(process.env.RATE_LIMIT_AUTH_WINDOW) - if (windowMs !== RateLimiterFactory.DEFAULT_WINDOW_MS) { - Logger.info(`[RateLimiterFactory] Authentication rate limiting window set to ${windowMs}ms by ENV variable`) - } - } - - let max = RateLimiterFactory.DEFAULT_MAX - if (parseInt(process.env.RATE_LIMIT_AUTH_MAX) > 0) { - max = parseInt(process.env.RATE_LIMIT_AUTH_MAX) - if (max !== RateLimiterFactory.DEFAULT_MAX) { - Logger.info(`[RateLimiterFactory] Authentication rate limiting max set to ${max} by ENV variable`) - } - } - - let message = 'Too many authentication requests' - if (process.env.RATE_LIMIT_AUTH_MESSAGE) { - message = process.env.RATE_LIMIT_AUTH_MESSAGE - } - - this.authRateLimiter = rateLimit({ - windowMs, - max, - standardHeaders: true, - legacyHeaders: false, - keyGenerator: (req) => { - // Override keyGenerator to handle proxy IPs - return requestIp.getClientIp(req) || req.ip - }, - handler: (req, res) => { - const userAgent = req.get('User-Agent') || 'Unknown' - const endpoint = req.path - const method = req.method - const ip = requestIp.getClientIp(req) || req.ip - - Logger.warn(`[RateLimiter] Rate limit exceeded - IP: ${ip}, Endpoint: ${method} ${endpoint}, User-Agent: ${userAgent}`) - - res.status(429).json({ - error: message - }) - } - }) - - Logger.debug(`[RateLimiterFactory] Created auth rate limiter: ${max} attempts per ${windowMs / 1000 / 60} minutes`) - - return this.authRateLimiter - } -} - -module.exports = new RateLimiterFactory() diff --git a/test/server/controllers/LibraryItemController.test.js b/test/server/controllers/LibraryItemController.test.js index 5a0422392..9972bd90f 100644 --- a/test/server/controllers/LibraryItemController.test.js +++ b/test/server/controllers/LibraryItemController.test.js @@ -6,7 +6,6 @@ const Database = require('../../../server/Database') const ApiRouter = require('../../../server/routers/ApiRouter') const LibraryItemController = require('../../../server/controllers/LibraryItemController') const ApiCacheManager = require('../../../server/managers/ApiCacheManager') -const Auth = require('../../../server/Auth') const Logger = require('../../../server/Logger') describe('LibraryItemController', () => { @@ -20,7 +19,6 @@ describe('LibraryItemController', () => { await Database.buildModels() apiRouter = new ApiRouter({ - auth: new Auth(), apiCacheManager: new ApiCacheManager() })