Mirrors/audiobookshelf
Mirrors/audiobookshelf
1
0
Fork 0
mirror of https://github.com/advplyr/audiobookshelf.git synced 2025-10-27 11:18:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1425 from lkiesow/undefined-uid-gid

Browse Source 
Skip AUDIOBOOKSHELF_UID/GID if undefined
This commit is contained in:
advplyr 2023-01-22 08:02:53 -06:00 committed by GitHub
commit 49a8aead9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
index.js
View File

@ -18,8 +18,8 @@ const PORT = process.env.PORT || 80
const HOST = process.env.HOST const HOST = process.env.HOST
const CONFIG_PATH = process.env.CONFIG_PATH || '/config' const CONFIG_PATH = process.env.CONFIG_PATH || '/config'
const METADATA_PATH = process.env.METADATA_PATH || '/metadata' const METADATA_PATH = process.env.METADATA_PATH || '/metadata'
const UID = process.env.AUDIOBOOKSHELF_UID || 99 const UID = process.env.AUDIOBOOKSHELF_UID
const GID = process.env.AUDIOBOOKSHELF_GID || 100 const GID = process.env.AUDIOBOOKSHELF_GID
const SOURCE = process.env.SOURCE || 'docker' const SOURCE = process.env.SOURCE || 'docker'
const ROUTER_BASE_PATH = process.env.ROUTER_BASE_PATH || '' const ROUTER_BASE_PATH = process.env.ROUTER_BASE_PATH || ''

4
prod.js
View File

@ -23,8 +23,8 @@ const PORT = options.port || process.env.PORT || 3333
const HOST = options.host || process.env.HOST || "0.0.0.0" const HOST = options.host || process.env.HOST || "0.0.0.0"
const CONFIG_PATH = inputConfig || process.env.CONFIG_PATH || Path.resolve('config') const CONFIG_PATH = inputConfig || process.env.CONFIG_PATH || Path.resolve('config')
const METADATA_PATH = inputMetadata || process.env.METADATA_PATH || Path.resolve('metadata') const METADATA_PATH = inputMetadata || process.env.METADATA_PATH || Path.resolve('metadata')
const UID = 99 const UID = process.env.AUDIOBOOKSHELF_UID
const GID = 100 const GID = process.env.AUDIOBOOKSHELF_GID
const SOURCE = options.source || 'debian' const SOURCE = options.source || 'debian'
const ROUTER_BASE_PATH = process.env.ROUTER_BASE_PATH || '' const ROUTER_BASE_PATH = process.env.ROUTER_BASE_PATH || ''

4
server/Server.js
View File

@ -43,8 +43,8 @@ class Server {
this.Host = HOST this.Host = HOST
global.Source = SOURCE global.Source = SOURCE
global.isWin = process.platform === 'win32' global.isWin = process.platform === 'win32'
global.Uid = isNaN(UID) ? 0 : Number(UID) global.Uid = isNaN(UID) ? undefined : Number(UID)
global.Gid = isNaN(GID) ? 0 : Number(GID) global.Gid = isNaN(GID) ? undefined : Number(GID)
global.ConfigPath = fileUtils.filePathToPOSIX(Path.normalize(CONFIG_PATH)) global.ConfigPath = fileUtils.filePathToPOSIX(Path.normalize(CONFIG_PATH))
global.MetadataPath = fileUtils.filePathToPOSIX(Path.normalize(METADATA_PATH)) global.MetadataPath = fileUtils.filePathToPOSIX(Path.normalize(METADATA_PATH))
global.RouterBasePath = ROUTER_BASE_PATH global.RouterBasePath = ROUTER_BASE_PATH

10
server/utils/filePerms.js
View File

@ -91,7 +91,11 @@ module.exports.setDefault = (path, silent = false) => {
const uid = global.Uid const uid = global.Uid
const gid = global.Gid const gid = global.Gid
return new Promise((resolve) => { return new Promise((resolve) => {
if (!silent) Logger.debug(`[FilePerms] Setting permission "${mode}" for uid ${uid} and gid ${gid} | "${path}"`) if (isNaN(uid) || isNaN(gid)) {
if (!silent) Logger.debug('Not modifying permissions since no uid/gid is specified')
return resolve()
}
if (!silent) Logger.debug(`Setting permission "${mode}" for uid ${uid} and gid ${gid} | "${path}"`)
chmodr(path, mode, uid, gid, resolve) chmodr(path, mode, uid, gid, resolve)
}) })
} }
@ -102,6 +106,10 @@ module.exports.setDefaultDirSync = (path, silent = false) => {
const mode = 0o744 const mode = 0o744
const uid = global.Uid const uid = global.Uid
const gid = global.Gid const gid = global.Gid
if (isNaN(uid) || isNaN(gid)) {
if (!silent) Logger.debug('Not modifying permissions since no uid/gid is specified')
return true
}
if (!silent) Logger.debug(`[FilePerms] Setting dir permission "${mode}" for uid ${uid} and gid ${gid} | "${path}"`) if (!silent) Logger.debug(`[FilePerms] Setting dir permission "${mode}" for uid ${uid} and gid ${gid} | "${path}"`)
try { try {
fs.chmodSync(path, mode) fs.chmodSync(path, mode)