lee/caprover
1
0
Fork 0
mirror of https://github.com/caprover/caprover synced 2026-09-24 07:35:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added support for http auth

Browse Source
This commit is contained in:
Kasra Bigdeli
2019-03-11 23:32:07 -07:00
parent cf9d5f647e
commit a5db1d023c
7 changed files with 139 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/datastore/AppsDataStore.ts
+1 -57
View File
@@ -169,7 +169,7 @@ class AppsDataStore {
) {
// we have required info
passwordToBeEncrypted = pushWebhook.repoInfo.password
sshKeyToBeEncrypted = pushWebhook.repoInfo.sshKey
sshKeyToBeEncrypted = pushWebhook.repoInfo.sshKey || ''
pushWebhook.repoInfo.password = ''
pushWebhook.repoInfo.sshKey = ''
} else {
@@ -776,62 +776,6 @@ class AppsDataStore {
})
}
getAppsServerConfig(
defaultAppNginxConfig: string,
hasRootSsl: boolean,
rootDomain: string
) {
const self = this
const servers: IServerBlockDetails[] = []
return self.getAppDefinitions().then(function(apps) {
Object.keys(apps).forEach(function(appName) {
const webApp = apps[appName]
if (webApp.notExposeAsWebApp) {
return
}
const localDomain = self.getServiceName(appName)
const forceSsl = !!webApp.forceSsl
const nginxConfigTemplate =
webApp.customNginxConfig || defaultAppNginxConfig
const serverWithSubDomain = {} as IServerBlockDetails
serverWithSubDomain.hasSsl =
hasRootSsl && webApp.hasDefaultSubDomainSsl
serverWithSubDomain.publicDomain = appName + '.' + rootDomain
serverWithSubDomain.localDomain = localDomain
serverWithSubDomain.forceSsl = forceSsl
const httpPort = webApp.containerHttpPort || 80
serverWithSubDomain.containerHttpPort = httpPort
serverWithSubDomain.nginxConfigTemplate = nginxConfigTemplate
servers.push(serverWithSubDomain)
// adding custom domains
const customDomainArray = webApp.customDomain
if (customDomainArray && customDomainArray.length > 0) {
for (let idx = 0; idx < customDomainArray.length; idx++) {
const d = customDomainArray[idx]
servers.push({
containerHttpPort: httpPort,
hasSsl: d.hasSsl,
forceSsl: forceSsl,
publicDomain: d.publicDomain,
localDomain: localDomain,
nginxConfigTemplate: nginxConfigTemplate,
staticWebRoot: '',
customErrorPagesDirectory: '',
})
}
}
})
return servers
})
}
}
export = AppsDataStore
src/datastore/DataStore.ts
-32
View File
@@ -136,38 +136,6 @@ class DataStore {
return !!this.data.get(CUSTOM_DOMAIN)
}
getServerList() {
const self = this
let hasRootSsl: boolean
let rootDomain: string
return Promise.resolve()
.then(function() {
return self.getHasRootSsl()
})
.then(function(val: boolean) {
hasRootSsl = val
return self.getRootDomain()
})
.then(function(val) {
rootDomain = val
})
.then(function() {
return self.getDefaultAppNginxConfig()
})
.then(function(defaultAppNginxConfig) {
return self
.getAppsDataStore()
.getAppsServerConfig(
defaultAppNginxConfig,
hasRootSsl,
rootDomain
)
})
}
getAppsDataStore() {
return this.appsDataStore
}
src/models/AppDefinition.ts
+3 -2
View File
@@ -24,7 +24,7 @@ interface RepoInfo {
repo: string
branch: string
user: string
sshKey: string
sshKey?: string
password: string
}
@@ -32,7 +32,7 @@ interface RepoInfoEncrypted {
repo: string
branch: string
user: string
sshKeyEncrypted: string
sshKeyEncrypted?: string
passwordEncrypted: string
}
@@ -54,6 +54,7 @@ interface IAppDefinitionBase {
hasPersistentData: boolean
hasDefaultSubDomainSsl: boolean
containerHttpPort?: number
httpBasicAuth?: string
captainDefinitionRelativeFilePath: string
forceSsl: boolean
nodeId?: string
src/models/IServerBlockDetails.ts
+2
View File
@@ -5,6 +5,8 @@ interface IServerBlockDetails {
localDomain: string
nginxConfigTemplate: string
containerHttpPort: number
httpBasicAuth?: string
httpBasicAuthPath?: string
crtPath?: string
keyPath?: string
src/user/ImageMaker.ts
+1 -1
View File
@@ -311,7 +311,7 @@ export default class ImageMaker {
return GitHelper.clone(
srcRepo.user,
srcRepo.password,
srcRepo.sshKey,
srcRepo.sshKey || '',
srcRepo.repo,
srcRepo.branch,
destDirectory
src/user/system/LoadBalancerManager.ts
+122 -2
View File
@@ -10,11 +10,14 @@ import DataStore = require('../../datastore/DataStore')
import CertbotManager = require('./CertbotManager')
import { AnyError } from '../../models/OtherTypes'
import LoadBalancerInfo from '../../models/LoadBalancerInfo'
import * as path from 'path'
const defaultPageTemplate = fs
.readFileSync(__dirname + '/../../../template/default-page.ejs')
.toString()
const CONTAINER_PATH_OF_CONFIG = '/etc/nginx/conf.d'
class LoadBalancerManager {
private reloadInProcess: boolean
private requestedReloadPromises: {
@@ -90,7 +93,7 @@ class LoadBalancerManager {
return fs.remove(FUTURE)
})
.then(function() {
return dataStore.getServerList()
return self.getServerList(dataStore)
})
.then(function(servers) {
const promises: Promise<void>[] = []
@@ -113,8 +116,23 @@ class LoadBalancerManager {
CaptainConstants.nginxStaticRootDir +
CaptainConstants.nginxDefaultHtmlDir
const pathOfAuthInHost =
configFilePathBase + '-' + s.publicDomain + '.auth'
promises.push(
Promise.resolve()
.then(function() {
if (s.httpBasicAuth) {
s.httpBasicAuthPath = path.join(
CONTAINER_PATH_OF_CONFIG,
path.basename(pathOfAuthInHost)
)
return fs.outputFile(
pathOfAuthInHost,
s.httpBasicAuth
)
}
})
.then(function() {
return ejs.render(s.nginxConfigTemplate, {
s: s,
@@ -162,6 +180,108 @@ class LoadBalancerManager {
})
}
getServerList(dataStore: DataStore) {
const self = this
let hasRootSsl: boolean
let rootDomain: string
return Promise.resolve()
.then(function() {
return dataStore.getHasRootSsl()
})
.then(function(val: boolean) {
hasRootSsl = val
return dataStore.getRootDomain()
})
.then(function(val) {
rootDomain = val
})
.then(function() {
return dataStore.getDefaultAppNginxConfig()
})
.then(function(defaultAppNginxConfig) {
return self.getAppsServerConfig(
dataStore,
defaultAppNginxConfig,
hasRootSsl,
rootDomain
)
})
}
getAppsServerConfig(
dataStore: DataStore,
defaultAppNginxConfig: string,
hasRootSsl: boolean,
rootDomain: string
) {
const self = this
const servers: IServerBlockDetails[] = []
return dataStore
.getAppsDataStore()
.getAppDefinitions()
.then(function(apps) {
Object.keys(apps).forEach(function(appName) {
const webApp = apps[appName]
const httpBasicAuth = webApp.httpBasicAuth || ''
if (webApp.notExposeAsWebApp) {
return
}
const localDomain = dataStore
.getAppsDataStore()
.getServiceName(appName)
const forceSsl = !!webApp.forceSsl
const nginxConfigTemplate =
webApp.customNginxConfig || defaultAppNginxConfig
const serverWithSubDomain = {} as IServerBlockDetails
serverWithSubDomain.hasSsl =
hasRootSsl && webApp.hasDefaultSubDomainSsl
serverWithSubDomain.publicDomain =
appName + '.' + rootDomain
serverWithSubDomain.localDomain = localDomain
serverWithSubDomain.forceSsl = forceSsl
const httpPort = webApp.containerHttpPort || 80
serverWithSubDomain.containerHttpPort = httpPort
serverWithSubDomain.nginxConfigTemplate = nginxConfigTemplate
serverWithSubDomain.httpBasicAuth = httpBasicAuth
servers.push(serverWithSubDomain)
// adding custom domains
const customDomainArray = webApp.customDomain
if (customDomainArray && customDomainArray.length > 0) {
for (
let idx = 0;
idx < customDomainArray.length;
idx++
) {
const d = customDomainArray[idx]
servers.push({
containerHttpPort: httpPort,
hasSsl: d.hasSsl,
forceSsl: forceSsl,
publicDomain: d.publicDomain,
localDomain: localDomain,
nginxConfigTemplate: nginxConfigTemplate,
staticWebRoot: '',
customErrorPagesDirectory: '',
httpBasicAuth: httpBasicAuth,
})
}
}
})
return servers
})
}
sendReloadSignal() {
return this.dockerApi.sendSingleContainerKillHUP(
CaptainConstants.nginxServiceName
@@ -512,7 +632,7 @@ class LoadBalancerManager {
hostPath: CaptainConstants.baseNginxConfigPath,
},
{
containerPath: '/etc/nginx/conf.d',
containerPath: CONTAINER_PATH_OF_CONFIG,
hostPath:
CaptainConstants.perAppNginxConfigPathBase,
},
template/server-block-conf.ejs
+10
View File
@@ -60,6 +60,16 @@ if (!s.forceSsl || s.hasSsl) {
set $upstream http://<%-s.localDomain%>:<%-s.containerHttpPort%>;
location / {
<%
if (s.httpBasicAuthPath) {
%>
auth_basic "Restricted Access";
auth_basic_user_file <%-s.httpBasicAuthPath%>;
<%
}
%>
proxy_pass $upstream;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;