Merge branch 'main' into kcli-bug-fixes

Author: ukumar-ks

KeeperSdk/README.md

@@ -429,6 +429,9 @@ Most examples call the shared `login()` helper, which attempts persistent login
 
 See [`examples/sdk_example/README.md`](../examples/sdk_example/README.md) for the full command list.
 
+Prefer an interactive shell over one-off scripts? See [`examples/repl`](../examples/repl/README.md)
+for a REPL that logs in once and runs vault commands (`ls`, `cd`, `get`, `find`, …) until you exit.
+
 ---
 
 ## Development Setup
@@ -467,6 +470,7 @@ keeper-sdk-javascript/
 ├── keeperapi/                 # @keeper-security/keeperapi
 └── examples/
     ├── sdk_example/           # Runnable Node scripts (auth, records, folders, …)
+    ├── repl/                  # Interactive vault shell
     ├── print-vault-node/      # Additional Node sample
     └── print-vault-browser/   # Browser sample
 ```

KeeperSdk/package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@keeper-security/keeper-sdk-javascript",
-    "version": "2.0.0",
+    "version": "2.1.0",
     "description": "High-level wrapper for Keeper Security JavaScript SDK",
     "repository": {
         "type": "git",
@@ -24,7 +24,7 @@
         "prepublishOnly": "npm run build"
     },
     "dependencies": {
-        "@keeper-security/keeperapi": "^18.1.1",
+        "@keeper-security/keeperapi": "18.2.0",
         "@keeper-security/secrets-manager-core": "^17.5.0",
         "asmcrypto.js": "^2.3.2",
         "ts-node": "^10.7.0",

KeeperSdk/package.json

@@ -341,7 +341,11 @@ async function syncVault(vault: KeeperVault): Promise<KeeperVault> {
     return vault
 }
 
+export function closePrompt(): void {
+    getReadlineManager().close()
+}
+
 export function cleanup(vault: KeeperVault): void {
     vault.disconnect()
-    getReadlineManager().close()
+    closePrompt()
 }

KeeperSdk/src/auth/ConsoleLogin.ts

@@ -83,6 +83,30 @@ export class SessionManager implements SessionStorage {
     public createOnDeviceConfig(host: string): (deviceConfig: DeviceConfig) => Promise<void> {
         return async (deviceConfig: DeviceConfig) => {
             this.sessionDevices.set(host, { ...deviceConfig })
+            await this.persistDeviceConfig(host, deviceConfig)
+        }
+    }
+
+    private async persistDeviceConfig(host: string, deviceConfig: DeviceConfig): Promise<void> {
+        if (!deviceConfig.deviceToken || !deviceConfig.privateKey) return
+
+        const username = this._lastUsername
+        if (!username) return
+
+        try {
+            const parsed = await this.configLoader.load()
+            const config: KeeperJsonConfig = parsed && Object.keys(parsed).length > 0 ? parsed : {}
+
+            config.device_token = Buffer.from(deviceConfig.deviceToken).toString('base64url')
+            config.private_key = Buffer.from(deviceConfig.privateKey).toString('base64url')
+            config.user = username
+            config.server = host
+
+            await this.configLoader.save(config)
+            this._keeperConfig = null
+            this._deviceCache = null
+        } catch (err) {
+            logger.warn('Failed to persist device config:', extractErrorMessage(err))
         }
     }
 
@@ -135,12 +159,15 @@ export class SessionManager implements SessionStorage {
                 const device = (parsed.devices || []).find(
                     (configDevice) => configDevice.device_token === user.last_device!.device_token
                 )
-                if (device?.server_info) {
-                    const serverInfo = device.server_info.find((entry) => entry.server === host)
-                    if (serverInfo) {
-                        serverInfo.clone_code = encodedCloneCode
-                        updated = true
+                if (device) {
+                    device.server_info = device.server_info || []
+                    let serverInfo = device.server_info.find((entry) => entry.server === host)
+                    if (!serverInfo) {
+                        serverInfo = { server: host }
+                        device.server_info.push(serverInfo)
                     }
+                    serverInfo.clone_code = encodedCloneCode
+                    updated = true
                 }
             }
 

KeeperSdk/src/auth/SessionManager.ts

@@ -29,6 +29,7 @@ export class FileConfigLoader implements ConfigLoader {
 
     async save(config: KeeperJsonConfig): Promise<void> {
         const configPath = path.join(this.configDir, 'config.json')
+        await fs.mkdir(this.configDir, { recursive: true, mode: 0o700 })
         await fs.writeFile(configPath, JSON.stringify(config, null, 2), {
             mode: 0o600,
         })

KeeperSdk/src/auth/node/FileConfigLoader.ts

@@ -16,7 +16,7 @@ export type {
     ConfigurationServerConfig,
     ConfigurationDeviceConfig,
 } from './auth/SessionManager'
-export { login, cleanup, prompt, suppressLogs, loadKeeperConfig, resolveServer } from './auth/ConsoleLogin'
+export { login, cleanup, closePrompt, prompt, suppressLogs, loadKeeperConfig, resolveServer } from './auth/ConsoleLogin'
 export { connectSdkPlatform, getSdkPlatform, isSdkPlatformConnected } from './platform'
 export type { SdkPlatform, SdkReadline, SdkRuntime } from './platform'
 export type { SessionRestoreInput } from './auth/sessionRestore'
@@ -894,6 +894,67 @@ export {
     fetchEnterprisePamControllers,
     groupOnlineGatewaysByControllerUid,
     isKeeperRouterConnectionError,
+    ConfigManager,
+    listPamConfigurations,
+    formatPamConfigurationsTable,
+    renderPamConfigurationsAsciiTable,
+    formatPamConfigurationsJson,
+    formatPamConfigurationsOutput,
+    createPamConfiguration,
+    editPamConfiguration,
+    removePamConfiguration,
+    PamConfigListFormat,
+    SUPPORTED_PAM_CONFIGURATION_RECORD_VERSIONS,
+    PAM_CONFIGURATION_RECORD_TYPES,
+    PAM_CONFIG_ENVIRONMENT_TO_RECORD_TYPE,
+    PAM_CONFIG_ENVIRONMENTS,
+    PAM_CONFIGURATION_FALLBACK_SCHEMA_FIELDS,
+    PAM_RESOURCES_FIELD_TYPE,
+    FILE_REF_FIELD_TYPE,
+    SCHEDULE_FIELD_TYPE,
+    DEFAULT_PAM_CONFIG_SCHEDULE_VALUE,
+    EMPTY_PAM_CONFIGURATIONS_MESSAGE,
+    PAM_CONFIG_LIST_DEFAULT_HEADERS,
+    PAM_CONFIG_LIST_VERBOSE_HEADERS,
+    PAM_CONFIG_DETAIL_LABELS,
+    PAM_CONFIG_PERMISSION_DAG_KEYS,
+    PAM_CONFIG_PERMISSION_FLAGS,
+    PAM_CONFIG_PERMISSION_VALUES,
+    isPamConfigurationRecordType,
+    isPamConfigEnvironment,
+    resolvePamConfigurationRecordType,
+    isPamConfigurationRecord,
+    isSupportedPamConfigurationRecordVersion,
+    getPamConfigurationFields,
+    parsePamResources,
+    resolveSharedFolderName,
+    findSharedFolderUidForRecord,
+    listPamConfigurationRecords,
+    getPamConfigurationDisplayName,
+    normalizeFields,
+    ensureScheduleField,
+    mergeRecordFields,
+    adjustPamConfigurationFields,
+    seedPamConfigurationFieldsFromRecordTypeSoft,
+    seedPamConfigurationFieldsFromRecordTypeStrict,
+    readTypedRecordPayload,
+    upsertPamResourcesField,
+    resolveGatewayUidSoft,
+    findPamConfigurationByUidOrTitle,
+    resolveResourceRecordUidsToRemove,
+    linkConfigurationController,
+    hasPermissionsInput,
+    convertPermissionValue,
+    normalizePermissionValue,
+    buildAllowedSettingsFromPermissions,
+    applyPamConfigurationPermissions,
+    isPamConfigurationInFolder,
+    resolvePamConfigFolder,
+    findPamConfigFolderForRecord,
+    resolvePamConfigFolderTargetFromUid,
+    resolvePamConfigFolderName,
+    formatPamConfigFolderDisplay,
+    placePamConfigurationInFolder,
 } from './pam'
 export type {
     ListGatewaysOptions,
@@ -923,6 +984,36 @@ export type {
     GatewayJsonEntry,
     GatewaysJsonPayload,
     KsmAppRecordVersion,
+    PamConfigurationRecordType,
+    PamConfigurationRecordVersion,
+    PamConfigEnvironment,
+    PamConfigPermissionFlag,
+    PamConfigListFormatInput,
+    ListPamConfigurationsOptions,
+    PamResourcesInfo,
+    PamConfigurationField,
+    PamConfigurationListRow,
+    PamConfigurationDetail,
+    ListPamConfigurationsResult,
+    FormattedPamConfigurationsTable,
+    FormatPamConfigurationsTableOptions,
+    RenderPamConfigurationsAsciiTableOptions,
+    PamConfigurationJsonField,
+    PamConfigurationJsonEntry,
+    PamConfigurationsJsonPayload,
+    PamConfigurationRecordFieldInput,
+    PamConfigurationPermissionValue,
+    PamConfigurationPermissionsInput,
+    PamNetworkAllowedSettings,
+    CreatePamConfigurationInput,
+    CreatePamConfigurationResult,
+    EditPamConfigurationInput,
+    EditPamConfigurationResult,
+    RemovePamConfigurationInput,
+    RemovedPamConfiguration,
+    RemovePamConfigurationResult,
+    PamConfigFolderKind,
+    PamConfigFolderTarget,
 } from './pam'
 
 export type {

KeeperSdk/src/index.ts

@@ -60,11 +60,13 @@ export async function getNsfRecordTypeFields(auth: Auth, recordType: string): Pr
     const normalized = recordType.trim()
     if (!normalized || NSF_LEGACY_RECORD_TYPES.has(normalized)) return undefined
 
+    const lowered = normalized.toLowerCase()
     const types = await loadRecordTypes(auth)
     for (const entry of types) {
         if (!entry.content) continue
         const schema = parseRecordTypeSchema(entry.content)
-        if (schema?.id === normalized && schema.fields?.length) {
+        if (!schema?.id || !schema.fields?.length) continue
+        if (schema.id === normalized || schema.id.toLowerCase() === lowered) {
             return schema.fields
         }
     }

KeeperSdk/src/nestedShareFolders/nsfRecordTypes.ts

@@ -1,6 +1,20 @@
 import type { Auth } from '@keeper-security/keeperapi'
 import type { InMemoryStorage } from '../storage/InMemoryStorage'
+import { ConfigManager } from './config/ConfigManager'
 import { GatewayManager } from './gateway/GatewayManager'
+import type {
+    FormatPamConfigurationsTableOptions,
+    FormattedPamConfigurationsTable,
+    ListPamConfigurationsOptions,
+    ListPamConfigurationsResult,
+    RenderPamConfigurationsAsciiTableOptions,
+    CreatePamConfigurationInput,
+    CreatePamConfigurationResult,
+    EditPamConfigurationInput,
+    EditPamConfigurationResult,
+    RemovePamConfigurationInput,
+    RemovePamConfigurationResult,
+} from './config/configTypes'
 import type {
     CreateGatewayInput,
     CreateGatewayResult,
@@ -21,15 +35,21 @@ export type AuthProvider = () => Auth
 
 export class PamManager {
     private readonly gatewayManager: GatewayManager
+    private readonly configManager: ConfigManager
 
     constructor(storage: InMemoryStorage, authProvider: AuthProvider) {
         this.gatewayManager = new GatewayManager(storage, authProvider)
+        this.configManager = new ConfigManager(storage, authProvider)
     }
 
     public getGatewayManager(): GatewayManager {
         return this.gatewayManager
     }
 
+    public getConfigManager(): ConfigManager {
+        return this.configManager
+    }
+
     public async listGateways(options: ListGatewaysOptions = {}): Promise<ListGatewaysResult> {
         return this.gatewayManager.listGateways(options)
     }
@@ -71,4 +91,48 @@ export class PamManager {
     public formatGatewaysOutput(result: ListGatewaysResult, options: ListGatewaysOptions = {}): string {
         return this.gatewayManager.formatGatewaysOutput(result, options)
     }
+
+    public listPamConfigurations(options: ListPamConfigurationsOptions = {}): ListPamConfigurationsResult {
+        return this.configManager.listPamConfigurations(options)
+    }
+
+    public async createPamConfiguration(input: CreatePamConfigurationInput): Promise<CreatePamConfigurationResult> {
+        return this.configManager.createPamConfiguration(input)
+    }
+
+    public async editPamConfiguration(input: EditPamConfigurationInput): Promise<EditPamConfigurationResult> {
+        return this.configManager.editPamConfiguration(input)
+    }
+
+    public async removePamConfiguration(input: RemovePamConfigurationInput): Promise<RemovePamConfigurationResult> {
+        return this.configManager.removePamConfiguration(input)
+    }
+
+    public formatPamConfigurationsTable(
+        result: ListPamConfigurationsResult,
+        options: FormatPamConfigurationsTableOptions = {}
+    ): FormattedPamConfigurationsTable {
+        return this.configManager.formatPamConfigurationsTable(result, options)
+    }
+
+    public renderPamConfigurationsAsciiTable(
+        table: FormattedPamConfigurationsTable,
+        options: RenderPamConfigurationsAsciiTableOptions = {}
+    ): string {
+        return this.configManager.renderPamConfigurationsAsciiTable(table, options)
+    }
+
+    public formatPamConfigurationsJson(
+        result: ListPamConfigurationsResult,
+        options: ListPamConfigurationsOptions = {}
+    ): string {
+        return this.configManager.formatPamConfigurationsJson(result, options)
+    }
+
+    public formatPamConfigurationsOutput(
+        result: ListPamConfigurationsResult,
+        options: ListPamConfigurationsOptions = {}
+    ): string {
+        return this.configManager.formatPamConfigurationsOutput(result, options)
+    }
 }