samlesa 4.3.2 → 4.3.3

package/build/src/metadata-sp.js

@@ -238,177 +238,136 @@ export class SpMetadata extends Metadata {
         }
         return value === 'true';
     }
-    /**
-    * @desc Get the entity endpoint for assertion consumer service
-    * @param  {string} binding         protocol binding (e.g. redirect, post)
-    * @return {string/[string]} URL of endpoint(s)
-    */
-    getAssertionConsumerService(binding) {
-        // 1. 预处理 binding 参数
-        // 如果 binding 不是字符串，视为“未指定 Binding 偏好”，直接进入全局兜底逻辑 (Fallback Mode)
-        let targetBindingName = null;
-        let useFallbackMode = false;
-        if (typeof binding === 'string') {
-            const resolved = namespace.binding[binding];
-            if (resolved) {
-                targetBindingName = resolved;
+    getAssertionConsumerService(binding, options = {}) {
+        const mode = options.mode ?? 'lenient';
+        const normalizeBinding = (value) => String(value ?? '').trim().toLowerCase();
+        const normalizeLocation = (value) => String(value ?? '').trim();
+        const parseBool = (value) => {
+            if (typeof value === 'boolean')
+                return value;
+            if (typeof value === 'string') {
+                const t = value.trim().toLowerCase();
+                if (t === 'true')
+                    return true;
+                if (t === 'false')
+                    return false;
             }
-            else {
-                // 字符串传入了但 namespace 里没找到，也视为无效，进入兜底
-                //console.warn(`[ACS Selection] 未知的 binding 键值: ${binding}, 将启用全局兜底策略.`);
-                useFallbackMode = true;
+            return null;
+        };
+        const parseIndex = (value) => {
+            if (value === undefined || value === null || String(value).trim() === '')
+                return Number.POSITIVE_INFINITY;
+            const n = Number.parseInt(String(value), 10);
+            return Number.isNaN(n) ? Number.POSITIVE_INFINITY : n;
+        };
+        const indexHint = parseIndex(options.assertionConsumerServiceIndex);
+        const hasIndexHint = Number.isFinite(indexHint);
+        const toSafeLocation = (value) => {
+            const text = String(value || '').trim();
+            // 仅校验协议前缀，保持原始字符串不被规范化改写（兼容历史用例：如 "https:sp.example.org/..."）
+            if (/^https?:/i.test(text)) {
+                return text;
             }
-        }
-        else {
-            // 非字符串类型 (null, undefined, object 等)，直接启用兜底
-            // console.warn(`[ACS Selection] binding 参数类型错误 (${typeof binding}), 将启用全局兜底策略.`);
-            useFallbackMode = true;
-        }
-        const acsData = this.meta.assertionConsumerService;
-        // 2. 标准化数据为数组
-        let allCandidates = [];
-        if (Array.isArray(acsData)) {
-            allCandidates = acsData;
-        }
-        else if (acsData && typeof acsData === 'object') {
-            allCandidates = [acsData];
-        }
-        else {
-            // 数据源本身为空，直接报错
-            return "";
-            /*          throw new Error("SAML Metadata Error: No AssertionConsumerService definitions found in metadata.");*/
-        }
-        if (allCandidates.length === 0) {
-            return "";
-            /*  throw new Error("SAML Metadata Error: AssertionConsumerService list is empty.");*/
-        }
-        /**
-         * 核心排序与选择函数
-         * 输入一个候选数组，返回最佳的一个对象
-         */
-        const selectBestFromList = (list) => {
+            return '';
+        };
+        const resolveBindingUri = (input) => {
+            if (typeof input !== 'string')
+                return null;
+            const raw = input.trim();
+            if (!raw)
+                return null;
+            const byKey = namespace.binding[raw];
+            if (typeof byKey === 'string')
+                return byKey;
+            const lower = raw.toLowerCase();
+            const candidates = Object.values(namespace.binding).filter((v) => typeof v === 'string');
+            const byUri = candidates.find((v) => v.toLowerCase() === lower);
+            if (byUri)
+                return byUri;
+            const aliasMap = {
+                post: namespace.binding.post,
+                redirect: namespace.binding.redirect,
+                artifact: namespace.binding.artifact,
+                simplesign: namespace.binding.simpleSign,
+                'simple-sign': namespace.binding.simpleSign,
+                soap: namespace.binding.soap,
+            };
+            return aliasMap[lower] || null;
+        };
+        const sortCandidates = (list) => [...list].sort((a, b) => {
+            const score = (item) => item.isDefault === true ? 0 : (item.isDefault === null ? 1 : 2);
+            const sA = score(a);
+            const sB = score(b);
+            if (sA !== sB)
+                return sA - sB;
+            if (a.index !== b.index)
+                return a.index - b.index;
+            return a.order - b.order;
+        });
+        const pickBest = (list) => {
             if (list.length === 0)
-                return undefined;
-            if (list.length === 1)
-                return list[0];
-            const tier1 = []; // isDefault === 'true'
-            const tier2 = []; // isDefault 不存在 或 不为 'false'
-            const tier3 = []; // 明确 isDefault === 'false'
-            list.forEach((item, originalIndex) => {
-                const isDef = item.isDefault;
-                const isTrue = (typeof isDef === 'string' && isDef.toLowerCase() === 'true');
-                const isFalse = (typeof isDef === 'string' && isDef.toLowerCase() === 'false');
-                if (isTrue) {
-                    tier1.push(item);
-                }
-                else if (!isFalse) {
-                    tier2.push(item);
-                }
-                else {
-                    tier3.push(item);
-                }
-            });
-            let selectedTier = [];
-            if (tier1.length > 0) {
-                selectedTier = tier1;
-            }
-            else if (tier2.length > 0) {
-                selectedTier = tier2;
-            }
-            else {
-                selectedTier = tier3;
-            }
-            // 二级排序：Index 升序 -> 原始顺序
-            const indexedTier = selectedTier.map((item, idx) => ({ item, originalIdx: idx }));
-            indexedTier.sort((a, b) => {
-                // 安全解析 index
-                let idxA = Infinity;
-                let idxB = Infinity;
-                if (a.item.index !== undefined && a.item.index !== null) {
-                    const parsed = parseInt(a.item.index, 10);
-                    if (!isNaN(parsed))
-                        idxA = parsed;
-                }
-                if (b.item.index !== undefined && b.item.index !== null) {
-                    const parsed = parseInt(b.item.index, 10);
-                    if (!isNaN(parsed))
-                        idxB = parsed;
-                }
-                if (idxA !== idxB) {
-                    return idxA - idxB;
-                }
-                return a.originalIdx - b.originalIdx;
-            });
-            return indexedTier[0].item;
+                return null;
+            return sortCandidates(list)[0] ?? null;
         };
-        let resultLocation = undefined;
-        // ==========================================
-        // 第一阶段：尝试在指定的 binding 中查找 (仅在非兜底模式下执行)
-        // ==========================================
-        if (!useFallbackMode && targetBindingName) {
-            const matchedByBinding = allCandidates.filter(obj => obj.binding === targetBindingName);
-            // console.log(`[ACS Selection] 目标 Binding: ${targetBindingName}`);
-            //console.log(`[ACS Selection] 匹配该 Binding 的数量: ${matchedByBinding.length}`);
-            if (matchedByBinding.length > 0) {
-                const bestInBinding = selectBestFromList(matchedByBinding);
-                if (bestInBinding) {
-                    // console.log(`[ACS Selection] ✅ (阶段1) 在指定 Binding 中找到最佳项: ${bestInBinding.location}`);
-                    resultLocation = bestInBinding.location;
-                }
-            }
+        const pickByIndex = (list) => {
+            if (!hasIndexHint)
+                return null;
+            const hit = list.filter((item) => item.index === indexHint);
+            return pickBest(hit);
+        };
+        const acsData = this.meta.assertionConsumerService;
+        const rawCandidates = Array.isArray(acsData) ? acsData : (acsData && typeof acsData === 'object' ? [acsData] : []);
+        if (rawCandidates.length === 0)
+            return '';
+        const normalizedCandidates = rawCandidates
+            .map((item, order) => ({
+            binding: String(item?.binding ?? item?.Binding ?? '').trim(),
+            location: toSafeLocation(normalizeLocation(item?.location ?? item?.Location ?? item?.responseLocation ?? item?.ResponseLocation ?? '')),
+            isDefault: parseBool(item?.isDefault ?? item?.IsDefault ?? item?.default),
+            index: parseIndex(item?.index ?? item?.Index),
+            order,
+        }))
+            .filter((item) => item.location);
+        if (normalizedCandidates.length === 0)
+            return '';
+        const dedupMap = new Map();
+        for (const item of normalizedCandidates) {
+            const key = `${normalizeBinding(item.binding)}|${item.location}|${Number.isFinite(item.index) ? item.index : 'NA'}`;
+            if (!dedupMap.has(key))
+                dedupMap.set(key, item);
         }
-        // ==========================================
-        // 第二阶段：降级/兜底策略
-        // 如果第一阶段没找到，或者一开始就进入了兜底模式 (useFallbackMode)
-        // ==========================================
-        if (!resultLocation) {
-            if (useFallbackMode) {
-                //console.log(`[ACS Selection] ⚠️ 启用全局兜底策略 (未指定有效 Binding)...`);
-            }
-            else {
-                //console.log(`[ACS Selection] ⚠️ 指定 Binding 未找到可用项，进入降级策略...`);
-            }
-            // 2.1 全局寻找 isDefault='true'
-            const globalDefaults = allCandidates.filter(obj => obj.isDefault && String(obj.isDefault).toLowerCase() === 'true');
-            if (globalDefaults.length > 0) {
-                const best = selectBestFromList(globalDefaults);
-                if (best) {
-                    //console.log(`[ACS Selection] ✅ (阶段2) 跨 Binding 找到 isDefault=true: ${best.location} (${best.binding})`);
-                    resultLocation = best.location;
-                }
-            }
-            // 2.2 全局寻找 isDefault 不为 'false' (隐式默认)
-            if (!resultLocation) {
-                const globalNonFalse = allCandidates.filter(obj => {
-                    const isDef = obj.isDefault;
-                    const isFalse = (typeof isDef === 'string' && isDef.toLowerCase() === 'false');
-                    return !isFalse;
-                });
-                if (globalNonFalse.length > 0) {
-                    const best = selectBestFromList(globalNonFalse);
-                    if (best) {
-                        //console.log(`[ACS Selection] ✅ (阶段3) 跨 Binding 找到隐式默认: ${best.location} (${best.binding})`);
-                        resultLocation = best.location;
-                    }
-                }
-            }
-            // 2.3 终极兜底：所有数据中 index 最小
-            if (!resultLocation) {
-                const best = selectBestFromList(allCandidates);
-                if (best) {
-                    //  console.log(`[ACS Selection] ✅ (阶段4) 终极兜底，选择 index 最小: ${best.location} (${best.binding})`);
-                    resultLocation = best.location;
-                }
+        const allCandidates = Array.from(dedupMap.values());
+        const targetBindingName = resolveBindingUri(binding);
+        const boundCandidates = targetBindingName
+            ? allCandidates.filter((item) => normalizeBinding(item.binding) === normalizeBinding(targetBindingName))
+            : [];
+        const warnDefaultConflict = (list, label) => {
+            const defaults = list.filter((item) => item.isDefault === true);
+            if (defaults.length > 1) {
+                console.warn(`[ACS Selection] Multiple isDefault=true found in ${label}; fallback to index/order.`);
             }
+        };
+        warnDefaultConflict(targetBindingName ? boundCandidates : allCandidates, targetBindingName ? `binding=${targetBindingName}` : 'all bindings');
+        // 1) index 优先：先同 binding，再全局(仅 lenient)
+        const indexedInBinding = pickByIndex(boundCandidates);
+        if (indexedInBinding)
+            return indexedInBinding.location;
+        if (targetBindingName && mode === 'strict' && boundCandidates.length === 0) {
+            return '';
         }
-        // ==========================================
-        // 最终检查：如果还是没找到，抛出错误
-        // ==========================================
-        if (!resultLocation) {
-            const errorMsg = "SAML Configuration Error: Unable to select any valid AssertionConsumerService URL. Metadata might be empty or malformed.";
-            console.error(`[ACS Selection] ❌ ${errorMsg}`);
-            throw new Error(errorMsg);
+        if (mode === 'lenient') {
+            const indexedGlobal = pickByIndex(allCandidates);
+            if (indexedGlobal)
+                return indexedGlobal.location;
         }
-        return resultLocation;
+        // 2) 绑定内最优
+        const bestBound = pickBest(boundCandidates);
+        if (bestBound)
+            return bestBound.location;
+        if (mode === 'strict' && targetBindingName)
+            return '';
+        // 3) 全局回退
+        const bestGlobal = pickBest(allCandidates);
+        return bestGlobal?.location ?? '';
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "samlesa",
-  "version": "4.3.2",
+  "version": "4.3.3",
   "description": "High-level API for Single Sign On (SAML 2.0) baseed on samlify ",
   "main": "build/index.js",
   "keywords": [

package/types/src/metadata-sp.d.ts

@@ -7,6 +7,11 @@ import Metadata, { type MetadataInterface } from './metadata.js';
 import type { MetadataSpConstructor } from './types.js';
 export interface SpMetadataInterface extends MetadataInterface {
 }
+type AcsSelectionMode = 'strict' | 'lenient';
+interface AcsSelectionOptions {
+    mode?: AcsSelectionMode;
+    assertionConsumerServiceIndex?: string | number | null;
+}
 export default function (meta: MetadataSpConstructor): SpMetadata;
 /**
 * @desc SP Metadata is for creating Service Provider, provides a set of API to manage the actions in SP.
@@ -32,6 +37,8 @@ export declare class SpMetadata extends Metadata {
     * @param  {string} binding         protocol binding (e.g. redirect, post)
     * @return {string/[string]} URL of endpoint(s)
     */
-    getAssertionConsumerService(binding: string): string;
+    getAssertionConsumerService(binding?: string): string;
+    getAssertionConsumerService(binding: string | undefined, options: AcsSelectionOptions): string;
 }
+export {};
 //# sourceMappingURL=metadata-sp.d.ts.map

package/types/src/metadata-sp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"metadata-sp.d.ts","sourceRoot":"","sources":["../../src/metadata-sp.ts"],"names":[],"mappings":"AAAA;;;;EAIE;AACF,OAAO,QAAQ,EAAE,EAAC,KAAK,iBAAiB,EAAC,MAAM,eAAe,CAAC;AAE/D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAMxD,MAAM,WAAW,mBAAoB,SAAQ,iBAAiB;CAE7D;AAeD,MAAM,CAAC,OAAO,WAAU,IAAI,EAAE,qBAAqB,cAElD;AAED;;EAEE;AACF,qBAAa,UAAW,SAAQ,QAAQ;IAEtC;;;MAGE;gBACU,IAAI,EAAE,qBAAqB;IA+NvC;;;MAGE;IACK,sBAAsB,IAAI,OAAO;IAOxC;;;MAGE;IACK,oBAAoB,IAAI,OAAO;IAOtC;;;;MAIE;IACK,2BAA2B,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;CAwL5D"}
+{"version":3,"file":"metadata-sp.d.ts","sourceRoot":"","sources":["../../src/metadata-sp.ts"],"names":[],"mappings":"AAAA;;;;EAIE;AACF,OAAO,QAAQ,EAAE,EAAC,KAAK,iBAAiB,EAAC,MAAM,eAAe,CAAC;AAE/D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAMxD,MAAM,WAAW,mBAAoB,SAAQ,iBAAiB;CAE7D;AAYD,KAAK,gBAAgB,GAAG,QAAQ,GAAG,SAAS,CAAC;AAC7C,UAAU,mBAAmB;IAC3B,IAAI,CAAC,EAAE,gBAAgB,CAAC;IACxB,6BAA6B,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;CACxD;AAKD,MAAM,CAAC,OAAO,WAAU,IAAI,EAAE,qBAAqB,cAElD;AAED;;EAEE;AACF,qBAAa,UAAW,SAAQ,QAAQ;IAEtC;;;MAGE;gBACU,IAAI,EAAE,qBAAqB;IA+NvC;;;MAGE;IACK,sBAAsB,IAAI,OAAO;IAOxC;;;MAGE;IACK,oBAAoB,IAAI,OAAO;IAOtC;;;;MAIE;IACK,2BAA2B,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM;IACrD,2BAA2B,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,EAAE,mBAAmB,GAAG,MAAM;CAmItG"}