Skip to content
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

Jump to bottom

Add new keyfile option for signature verification #311

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+9 −11
Open

Add new keyfile option for signature verification #311

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2398533
Add new keyfile option for signature verification
tngan Oct 9, 2019
70055e1
Fix typo
tngan Oct 9, 2019
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
5 changes: 3 additions & 2 deletions src/flow.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { inflateString, base64Decode } from './utility';
import { verifyTime } from './validator';
import libsaml from './libsaml';
import libsaml, { SignatureVerifierOptions } from './libsaml';
import {
extract,
loginRequestFields,
Expand Down Expand Up @@ -134,9 +134,10 @@ async function postFlow(options): Promise<FlowResult> {

let samlContent = String(base64Decode(encodedRequest));

const verificationOptions = {
const verificationOptions: SignatureVerifierOptions = {
cert: from.entityMeta,
signatureAlgorithm: from.entitySetting.requestSignatureAlgorithm,
keyFile: from.entitySetting.keyFile
};

const decryptRequired = from.entitySetting.isAssertionEncrypted;
Expand Down
15 changes: 6 additions & 9 deletions src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ export interface SAMLDocumentTemplate {
export type ServiceProviderSettings = {
metadata?: string | Buffer;
entityID?: string;
keyFile?: string;
authnRequestsSigned?: boolean;
wantAssertionsSigned?: boolean;
wantMessageSigned?: boolean;
Expand All @@ -69,8 +70,8 @@ export type ServiceProviderSettings = {
isAssertionEncrypted?: boolean;
encPrivateKey?: string | Buffer;
encPrivateKeyPass?: string | Buffer;
assertionConsumerService?: Array<{ Binding: string, Location: string }>;
singleLogoutService?: Array<{ Binding: string, Location: string }>;
assertionConsumeService?: Array<{ isDefault?: boolean, Binding: string, Location: string }>;
tngan marked this conversation as resolved.
Show resolved Hide resolved
singleLogoutService?: Array<{ isDefault?: boolean, Binding: string, Location: string }>;
signatureConfig?: SignatureConfig;
loginRequestTemplate?: SAMLDocumentTemplate;
logoutRequestTemplate?: SAMLDocumentTemplate;
Expand All @@ -84,27 +85,23 @@ export type ServiceProviderSettings = {

export type IdentityProviderSettings = {
metadata?: string | Buffer;

/** signature algorithm */
requestSignatureAlgorithm?: string;

/** template of login response */
loginResponseTemplate?: LoginResponseTemplate;

/** template of logout request */
logoutRequestTemplate?: SAMLDocumentTemplate;

/** customized function used for generating request ID */
generateID?: () => string;

entityID?: string;
keyFile?: string;
privateKey?: string | Buffer;
privateKeyPass?: string;
signingCert?: string | Buffer;
encryptCert?: string | Buffer; /** todo */
nameIDFormat?: string[];
singleSignOnService?: Array<{ [key: string]: string }>;
singleLogoutService?: Array<{ [key: string]: string }>;
singleSignOnService?: Array<{ isDefault?: boolean, Binding: string, Location: string }>;
singleLogoutService?: Array<{ isDefault?: boolean, Binding: string, Location: string }>;
isAssertionEncrypted?: boolean;
encPrivateKey?: string | Buffer;
encPrivateKeyPass?: string;
Expand Down