Skip to content

router cert site hosts determination logic updated #22

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
emirhandurmus merged 1 commit into from
Nov 5, 2025
Merged

router cert site hosts determination logic updated #22

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 17 additions & 14 deletions src/services/iofog-service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,24 +59,24 @@ async function getLocalCertificateHosts (isKubernetes, namespace) {
if (isKubernetes) {
return `router-local,router-local.${namespace},router-local.${namespace}.svc.cluster.local,127.0.0.1,localhost,host.docker.internal,host.containers.internal`
}
return '127.0.0.1,localhost,host.docker.internal,host.containers.internal'
return '127.0.0.1,localhost,host.docker.internal,host.containers.internal,iofog,service.local'
}

async function getSiteCertificateHosts (fogData, fogUuid, transaction) {
const hosts = new Set()
const defaultRouter = await RouterManager.findOne({ isDefault: true }, transaction)
const isFogDefaultRouter = fogUuid === defaultRouter.iofogUuid
// Add existing hosts if isSystem and fog is default-router
if (fogData.isSystem && isFogDefaultRouter) {
if (fogData.host) hosts.add(fogData.host)
if (fogData.ipAddress) hosts.add(fogData.ipAddress)
if (fogData.ipAddressExternal) hosts.add(fogData.ipAddressExternal)
}
// Add default router host if not system or fog isSystem but not default-router
if (!fogData.isSystem || (fogData.isSystem && !isFogDefaultRouter)) {
// const defaultRouter = await RouterManager.findOne({ isDefault: true }, transaction)
if (defaultRouter.host) hosts.add(defaultRouter.host)
}
// const defaultRouter = await RouterManager.findOne({ isDefault: true }, transaction)
// const isFogDefaultRouter = fogUuid === defaultRouter.iofogUuid
// // Add existing hosts if isSystem and fog is default-router
// if (fogData.isSystem && isFogDefaultRouter) {
// if (fogData.host) hosts.add(fogData.host)
// if (fogData.ipAddress) hosts.add(fogData.ipAddress)
// if (fogData.ipAddressExternal) hosts.add(fogData.ipAddressExternal)
// }
// // Add default router host if not system or fog isSystem but not default-router
// if (!fogData.isSystem || (fogData.isSystem && !isFogDefaultRouter)) {
// // const defaultRouter = await RouterManager.findOne({ isDefault: true }, transaction)
// if (defaultRouter.host) hosts.add(defaultRouter.host)
// }
// Add upstream router hosts
// const upstreamRouters = (fogData.upstreamRouters || []).filter(uuid => uuid !== 'default-router')
// if (upstreamRouters.length) {
Expand All @@ -86,6 +86,9 @@ async function getSiteCertificateHosts (fogData, fogUuid, transaction) {
// if (routerHost.ipAddress) hosts.add(routerHost.ipAddress)
// }
// }
if (fogData.host) hosts.add(fogData.host)
if (fogData.ipAddress) hosts.add(fogData.ipAddress)
if (fogData.ipAddressExternal) hosts.add(fogData.ipAddressExternal)
return Array.from(hosts).join(',') || 'localhost'
}

Expand Down
18 changes: 9 additions & 9 deletions src/services/router-service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,27 +444,27 @@ async function _getRouterMicroserviceConfig (isEdge, uuid, messagingPort, interR
// Add SSL profiles
if (siteServerSecret) {
config.sslProfiles[`${uuid}-site-server`] = {
CaCert: siteServerSecret.data['ca.crt'],
TlsCert: siteServerSecret.data['tls.crt'],
TlsKey: siteServerSecret.data['tls.key'],
caCert: siteServerSecret.data['ca.crt'],
tlsCert: siteServerSecret.data['tls.crt'],
tlsKey: siteServerSecret.data['tls.key'],
name: `${uuid}-site-server`
}
}

if (localServerSecret) {
config.sslProfiles[`${uuid}-local-server`] = {
CaCert: localServerSecret.data['ca.crt'],
TlsCert: localServerSecret.data['tls.crt'],
TlsKey: localServerSecret.data['tls.key'],
caCert: localServerSecret.data['ca.crt'],
tlsCert: localServerSecret.data['tls.crt'],
tlsKey: localServerSecret.data['tls.key'],
name: `${uuid}-local-server`
}
}

if (localAgentSecret) {
config.sslProfiles[`${uuid}-local-agent`] = {
CaCert: localAgentSecret.data['ca.crt'],
TlsCert: localAgentSecret.data['tls.crt'],
TlsKey: localAgentSecret.data['tls.key'],
caCert: localAgentSecret.data['ca.crt'],
tlsCert: localAgentSecret.data['tls.crt'],
tlsKey: localAgentSecret.data['tls.key'],
name: `${uuid}-local-agent`
}
}
Expand Down
Loading