You've already forked node-redis
mirror of
https://github.com/redis/node-redis.git
synced 2025-08-10 11:43:01 +03:00
* feat(auth): refactor authentication mechanism to use CredentialsProvider - Introduce new credential providers: AsyncCredentialsProvider, StreamingCredentialsProvider - Update client handshake process to use the new CredentialsProviders and to support async credentials fetch / credentials refresh - Internal conversion of username/password to a CredentialsProvider - Modify URL parsing to accommodate the new authentication structure - Tests * feat(auth): auth extensions Introduces TokenManager and supporting classes to handle token acquisition, automatic refresh, and updates via identity providers. This foundation enables consistent authentication token management across different identity provider implementations. Key additions: - Add TokenManager to obtain and maintain auth tokens from identity providers with automated refresh scheduling based on TTL and configurable thresholds - Add IdentityProvider interface for token acquisition from auth providers - Implement Token class for managing token state and TTL tracking - Include configurable retry mechanism with exponential backoff and jitter - Add comprehensive test suite covering refresh cycles and error handling This change establishes the core infrastructure needed for reliable token lifecycle management across different authentication providers. * feat(auth): add Entra ID identity provider integration Introduces Entra ID (former Azure AD) authentication support with multiple authentication flows and automated token lifecycle management. Key additions: - Add EntraIdCredentialsProvider for handling Entra ID authentication flows - Implement MSALIdentityProvider to integrate with MSAL/EntraID authentication library - Add support for multiple authentication methods: - Managed identities (system and user-assigned) - Client credentials with certificate - Client credentials with secret - Authorization Code flow with PKCE - Add factory class with builder methods for each authentication flow - Include sample Express server implementation for Authorization Code flow - Add comprehensive configuration options for authority and token management * feat(test-utils): improve cluster testing - Add support for configuring replica authentication with 'masterauth' - Allow default client configuration during test cluster creation This improves the testing framework's flexibility by automatically configuring replica authentication when '--requirepass' is used and enabling custom client configurations across cluster nodes. * feat(auth): add EntraId integration tests - Add integration tests for token renewal and re-authentication flows - Update credentials provider to use uniqueId as username instead of account username - Add test utilities for loading Redis endpoint configurations - Split TypeScript configs into separate files for samples and integration tests - Remove `@redis/authx` package and nest it under `@`
275 lines
7.3 KiB
TypeScript
275 lines
7.3 KiB
TypeScript
import { RedisClusterClientOptions } from '@redis/client/dist/lib/cluster';
|
|
import { createConnection } from 'node:net';
|
|
import { once } from 'node:events';
|
|
import { createClient } from '@redis/client/index';
|
|
import { setTimeout } from 'node:timers/promises';
|
|
// import { ClusterSlotsReply } from '@redis/client/dist/lib/commands/CLUSTER_SLOTS';
|
|
import { promisify } from 'node:util';
|
|
import { exec } from 'node:child_process';
|
|
const execAsync = promisify(exec);
|
|
|
|
interface ErrorWithCode extends Error {
|
|
code: string;
|
|
}
|
|
|
|
async function isPortAvailable(port: number): Promise<boolean> {
|
|
try {
|
|
const socket = createConnection({ port });
|
|
await once(socket, 'connect');
|
|
socket.end();
|
|
} catch (err) {
|
|
if (err instanceof Error && (err as ErrorWithCode).code === 'ECONNREFUSED') {
|
|
return true;
|
|
}
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
const portIterator = (async function* (): AsyncIterableIterator<number> {
|
|
for (let i = 6379; i < 65535; i++) {
|
|
if (await isPortAvailable(i)) {
|
|
yield i;
|
|
}
|
|
}
|
|
|
|
throw new Error('All ports are in use');
|
|
})();
|
|
|
|
export interface RedisServerDockerConfig {
|
|
image: string;
|
|
version: string;
|
|
}
|
|
|
|
export interface RedisServerDocker {
|
|
port: number;
|
|
dockerId: string;
|
|
}
|
|
|
|
async function spawnRedisServerDocker({ image, version }: RedisServerDockerConfig, serverArguments: Array<string>): Promise<RedisServerDocker> {
|
|
const port = (await portIterator.next()).value,
|
|
{ stdout, stderr } = await execAsync(
|
|
`docker run -e REDIS_ARGS="--port ${port.toString()} ${serverArguments.join(' ')}" -d --network host ${image}:${version}`
|
|
);
|
|
|
|
if (!stdout) {
|
|
throw new Error(`docker run error - ${stderr}`);
|
|
}
|
|
|
|
while (await isPortAvailable(port)) {
|
|
await setTimeout(50);
|
|
}
|
|
|
|
return {
|
|
port,
|
|
dockerId: stdout.trim()
|
|
};
|
|
}
|
|
|
|
const RUNNING_SERVERS = new Map<Array<string>, ReturnType<typeof spawnRedisServerDocker>>();
|
|
|
|
export function spawnRedisServer(dockerConfig: RedisServerDockerConfig, serverArguments: Array<string>): Promise<RedisServerDocker> {
|
|
const runningServer = RUNNING_SERVERS.get(serverArguments);
|
|
if (runningServer) {
|
|
return runningServer;
|
|
}
|
|
|
|
const dockerPromise = spawnRedisServerDocker(dockerConfig, serverArguments);
|
|
RUNNING_SERVERS.set(serverArguments, dockerPromise);
|
|
return dockerPromise;
|
|
}
|
|
|
|
async function dockerRemove(dockerId: string): Promise<void> {
|
|
const { stderr } = await execAsync(`docker rm -f ${dockerId}`);
|
|
if (stderr) {
|
|
throw new Error(`docker rm error - ${stderr}`);
|
|
}
|
|
}
|
|
|
|
after(() => {
|
|
return Promise.all(
|
|
[...RUNNING_SERVERS.values()].map(async dockerPromise =>
|
|
await dockerRemove((await dockerPromise).dockerId)
|
|
)
|
|
);
|
|
});
|
|
|
|
export interface RedisClusterDockersConfig extends RedisServerDockerConfig {
|
|
numberOfMasters?: number;
|
|
numberOfReplicas?: number;
|
|
}
|
|
|
|
async function spawnRedisClusterNodeDockers(
|
|
dockersConfig: RedisClusterDockersConfig,
|
|
serverArguments: Array<string>,
|
|
fromSlot: number,
|
|
toSlot: number,
|
|
clientConfig?: Partial<RedisClusterClientOptions>
|
|
) {
|
|
const range: Array<number> = [];
|
|
for (let i = fromSlot; i < toSlot; i++) {
|
|
range.push(i);
|
|
}
|
|
|
|
const master = await spawnRedisClusterNodeDocker(
|
|
dockersConfig,
|
|
serverArguments,
|
|
clientConfig
|
|
);
|
|
|
|
await master.client.clusterAddSlots(range);
|
|
|
|
if (!dockersConfig.numberOfReplicas) return [master];
|
|
|
|
const replicasPromises: Array<ReturnType<typeof spawnRedisClusterNodeDocker>> = [];
|
|
for (let i = 0; i < (dockersConfig.numberOfReplicas ?? 0); i++) {
|
|
replicasPromises.push(
|
|
spawnRedisClusterNodeDocker(dockersConfig, [
|
|
...serverArguments,
|
|
'--cluster-enabled',
|
|
'yes',
|
|
'--cluster-node-timeout',
|
|
'5000'
|
|
], clientConfig).then(async replica => {
|
|
|
|
const requirePassIndex = serverArguments.findIndex((x)=>x==='--requirepass');
|
|
if(requirePassIndex!==-1) {
|
|
const password = serverArguments[requirePassIndex+1];
|
|
await replica.client.configSet({'masterauth': password})
|
|
}
|
|
await replica.client.clusterMeet('127.0.0.1', master.docker.port);
|
|
|
|
while ((await replica.client.clusterSlots()).length === 0) {
|
|
await setTimeout(50);
|
|
}
|
|
|
|
await replica.client.clusterReplicate(
|
|
await master.client.clusterMyId()
|
|
);
|
|
|
|
return replica;
|
|
})
|
|
);
|
|
}
|
|
|
|
return [
|
|
master,
|
|
...await Promise.all(replicasPromises)
|
|
];
|
|
}
|
|
|
|
async function spawnRedisClusterNodeDocker(
|
|
dockersConfig: RedisClusterDockersConfig,
|
|
serverArguments: Array<string>,
|
|
clientConfig?: Partial<RedisClusterClientOptions>
|
|
) {
|
|
const docker = await spawnRedisServerDocker(dockersConfig, [
|
|
...serverArguments,
|
|
'--cluster-enabled',
|
|
'yes',
|
|
'--cluster-node-timeout',
|
|
'5000'
|
|
]),
|
|
client = createClient({
|
|
socket: {
|
|
port: docker.port
|
|
},
|
|
...clientConfig
|
|
});
|
|
|
|
await client.connect();
|
|
|
|
return {
|
|
docker,
|
|
client
|
|
};
|
|
}
|
|
|
|
const SLOTS = 16384;
|
|
|
|
async function spawnRedisClusterDockers(
|
|
dockersConfig: RedisClusterDockersConfig,
|
|
serverArguments: Array<string>,
|
|
clientConfig?: Partial<RedisClusterClientOptions>
|
|
): Promise<Array<RedisServerDocker>> {
|
|
const numberOfMasters = dockersConfig.numberOfMasters ?? 2,
|
|
slotsPerNode = Math.floor(SLOTS / numberOfMasters),
|
|
spawnPromises: Array<ReturnType<typeof spawnRedisClusterNodeDockers>> = [];
|
|
for (let i = 0; i < numberOfMasters; i++) {
|
|
const fromSlot = i * slotsPerNode,
|
|
toSlot = i === numberOfMasters - 1 ? SLOTS : fromSlot + slotsPerNode;
|
|
spawnPromises.push(
|
|
spawnRedisClusterNodeDockers(
|
|
dockersConfig,
|
|
serverArguments,
|
|
fromSlot,
|
|
toSlot,
|
|
clientConfig
|
|
)
|
|
);
|
|
}
|
|
|
|
const nodes = (await Promise.all(spawnPromises)).flat(),
|
|
meetPromises: Array<Promise<unknown>> = [];
|
|
for (let i = 1; i < nodes.length; i++) {
|
|
meetPromises.push(
|
|
nodes[i].client.clusterMeet('127.0.0.1', nodes[0].docker.port)
|
|
);
|
|
}
|
|
|
|
await Promise.all(meetPromises);
|
|
|
|
await Promise.all(
|
|
nodes.map(async ({ client }) => {
|
|
while (
|
|
totalNodes(await client.clusterSlots()) !== nodes.length ||
|
|
!(await client.sendCommand<string>(['CLUSTER', 'INFO'])).startsWith('cluster_state:ok') // TODO
|
|
) {
|
|
await setTimeout(50);
|
|
}
|
|
|
|
client.destroy();
|
|
})
|
|
);
|
|
|
|
return nodes.map(({ docker }) => docker);
|
|
}
|
|
|
|
// TODO: type ClusterSlotsReply
|
|
function totalNodes(slots: any) {
|
|
let total = slots.length;
|
|
for (const slot of slots) {
|
|
total += slot.replicas.length;
|
|
}
|
|
|
|
return total;
|
|
}
|
|
|
|
const RUNNING_CLUSTERS = new Map<Array<string>, ReturnType<typeof spawnRedisClusterDockers>>();
|
|
|
|
export function spawnRedisCluster(
|
|
dockersConfig: RedisClusterDockersConfig,
|
|
serverArguments: Array<string>,
|
|
clientConfig?: Partial<RedisClusterClientOptions>): Promise<Array<RedisServerDocker>> {
|
|
|
|
const runningCluster = RUNNING_CLUSTERS.get(serverArguments);
|
|
if (runningCluster) {
|
|
return runningCluster;
|
|
}
|
|
|
|
const dockersPromise = spawnRedisClusterDockers(dockersConfig, serverArguments,clientConfig);
|
|
|
|
RUNNING_CLUSTERS.set(serverArguments, dockersPromise);
|
|
return dockersPromise;
|
|
}
|
|
|
|
after(() => {
|
|
return Promise.all(
|
|
[...RUNNING_CLUSTERS.values()].map(async dockersPromise => {
|
|
return Promise.all(
|
|
(await dockersPromise).map(({ dockerId }) => dockerRemove(dockerId))
|
|
);
|
|
})
|
|
);
|
|
});
|