Infrastructure/logto
0
Fork 0
mirror of https://github.com/logto-io/logto.git synced 2024-12-16 20:26:19 -05:00
Code Issues Activity

refactor: refactor code

Browse source
This commit is contained in:
Darcy Ye 2024-12-09 11:14:33 +08:00
parent b8bb4e7177
commit b5481df6f5
No known key found for this signature in database
GPG key ID: B46F4C07EDEFC610
3 changed files with 29 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
packages/core/src/saml-applications/libraries/consts.ts
View file

@ -20,3 +20,17 @@ export const samlLogInResponseTemplate = `
{AttributeStatement} {AttributeStatement}
</saml:Assertion> </saml:Assertion>
</samlp:Response>`; </samlp:Response>`;
export const samlAttributeNameFormatBasic = 'urn:oasis:names:tc:SAML:2.0:attrname-format:basic';
const samlValueXmlnsXsiString = 'xs:string';
const samlValueXmlnsXsiInteger = 'xsd:integer';
const samlValueXmlnsXsiBoolean = 'xsd:boolean';
const samlValueXmlnsXsiDatetime = 'xsd:dateTime';
export const samlValueXmlnsXsi = {
string: samlValueXmlnsXsiString,
integer: samlValueXmlnsXsiInteger,
boolean: samlValueXmlnsXsiBoolean,
datetime: samlValueXmlnsXsiDatetime,
};

10
packages/core/src/saml-applications/routes/anonymous.ts
View file

@ -9,7 +9,7 @@ import { fetchOidcConfig, getUserInfo } from '#src/sso/OidcConnector/utils.js';
import { SsoConnectorError } from '#src/sso/types/error.js'; import { SsoConnectorError } from '#src/sso/types/error.js';
import assertThat from '#src/utils/assert-that.js'; import assertThat from '#src/utils/assert-that.js';
import { samlLogInResponseTemplate } from '../libraries/consts.js'; import { samlLogInResponseTemplate, samlAttributeNameFormatBasic,samlValueXmlnsXsi } from '../libraries/consts.js';
import { exchangeAuthorizationCode, generateAutoSubmitForm, createSamlResponse } from './utils.js'; import { exchangeAuthorizationCode, generateAutoSubmitForm, createSamlResponse } from './utils.js';
@ -129,14 +129,14 @@ export default function samlApplicationAnonymousRoutes<T extends AnonymousRouter
{ {
name: 'email', name: 'email',
valueTag: 'email', valueTag: 'email',
nameFormat: 'urn:oasis:names:tc:SAML:2.0:attrname-format:basic', nameFormat: samlAttributeNameFormatBasic,
valueXsiType: 'xs:string', valueXsiType: samlValueXmlnsXsi['string'],
}, },
{ {
name: 'name', name: 'name',
valueTag: 'name', valueTag: 'name',
nameFormat: 'urn:oasis:names:tc:SAML:2.0:attrname-format:basic', nameFormat: samlAttributeNameFormatBasic,
valueXsiType: 'xs:string', valueXsiType: samlValueXmlnsXsi['string'],
}, },
], ],
}, },

11
packages/core/src/saml-applications/routes/utils.ts
View file

@ -35,13 +35,22 @@ const createSamlTemplateCallback =
Issuer: idp.entityMeta.getEntityID(), Issuer: idp.entityMeta.getEntityID(),
IssueInstant: now.toISOString(), IssueInstant: now.toISOString(),
AssertionConsumerServiceURL: assertionConsumerServiceUrl, AssertionConsumerServiceURL: assertionConsumerServiceUrl,
StatusCode: 'urn:oasis:names:tc:SAML:2.0:status:Success', StatusCode: saml.Constants.StatusCode.Success,
ConditionsNotBefore: now.toISOString(), ConditionsNotBefore: now.toISOString(),
ConditionsNotOnOrAfter: expireAt.toISOString(), ConditionsNotOnOrAfter: expireAt.toISOString(),
SubjectConfirmationDataNotOnOrAfter: expireAt.toISOString(), SubjectConfirmationDataNotOnOrAfter: expireAt.toISOString(),
NameIDFormat: selectedNameIDFormat, NameIDFormat: selectedNameIDFormat,
NameID: user.sub, NameID: user.sub,
InResponseTo: 'null', InResponseTo: 'null',
/**
* User attributes for SAML response
*
* @todo Support custom attribute mapping
* @see {@link https://github.com/tngan/samlify/blob/master/src/libsaml.ts#L275-L300|samlify implementation}
*
* @remarks
* By examining the code provided in the link above, we can define all the attributes supported by the attribute mapping here. Only the attributes defined in the `loginResponseTemplate.attributes` added when creating the IdP instance will appear in the SAML response.
*/
attrEmail: user.email, attrEmail: user.email,
attrName: user.name, attrName: user.name,
}; };