Starship/node-radius-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chore: get everything up 2 date

Browse Source
This commit is contained in:
simon
2020-05-14 15:02:15 +02:00
parent 174f8b6fc1
commit 842b93634e
24 changed files with 1477 additions and 1016 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/radius/PacketHandler.ts
View File

@@ -14,7 +14,7 @@ export class PacketHandler implements IPacketHandler {
new EAPPacketHandler([
new EAPTTLS(authentication, this),
new EAPGTC(authentication),
new EAPMD5(authentication)
new EAPMD5(authentication),
])
);
this.packetHandlers.push(new UserPasswordPacketHandler(authentication));

4
src/radius/RadiusService.ts
View File

@@ -34,11 +34,11 @@ export class RadiusService {
packet,
code: response.code,
secret: this.secret,
attributes: response.attributes
attributes: response.attributes,
}),
// if message is accept or reject, we conside this as final message
// this means we do not expect a reponse from the client again (acknowledgement for package)
expectAcknowledgment: response.code === PacketResponseCode.AccessChallenge
expectAcknowledgment: response.code === PacketResponseCode.AccessChallenge,
};
}
}

8
src/radius/handler/EAPPacketHandler.ts
View File

@@ -27,7 +27,7 @@ export class EAPPacketHandler implements IPacketHandler {
if (!this.eapConnectionStates.get(stateID)) {
this.eapConnectionStates.set(stateID, {
validMethods: this.eapMethods.filter(eap => eap.getEAPType() !== handlingType) // on init all registered eap methods are valid, we kick them out in case we get a NAK response
validMethods: this.eapMethods.filter((eap) => eap.getEAPType() !== handlingType), // on init all registered eap methods are valid, we kick them out in case we get a NAK response
});
}
@@ -78,7 +78,7 @@ export class EAPPacketHandler implements IPacketHandler {
supportedEAPMethods.push(supportedMethod);
}
currentState.validMethods = currentState.validMethods.filter(method => {
currentState.validMethods = currentState.validMethods.filter((method) => {
return supportedEAPMethods.includes(method.getEAPType()); // kick it out?
});
// save
@@ -93,7 +93,7 @@ export class EAPPacketHandler implements IPacketHandler {
// continue with responding a NAK and add rest of supported methods
// eslint-disable-next-line no-fallthrough
default: {
const eapMethod = this.eapMethods.find(method => {
const eapMethod = this.eapMethods.find((method) => {
return type === method.getEAPType();
});
@@ -108,7 +108,7 @@ export class EAPPacketHandler implements IPacketHandler {
}
// we do not support this auth type, ask for something we support
const serverSupportedMethods = currentState.validMethods.map(method =>
const serverSupportedMethods = currentState.validMethods.map((method) =>
method.getEAPType()
);

6
src/radius/handler/UserPasswordPacketHandler.ts
View File

@@ -4,7 +4,7 @@ import {
IPacket,
IPacketHandler,
IPacketHandlerResult,
PacketResponseCode
PacketResponseCode,
} from '../../types/PacketHandler';
const log = debug('radius:user-pwd');
@@ -32,13 +32,13 @@ export class UserPasswordPacketHandler implements IPacketHandler {
// success
return {
code: PacketResponseCode.AccessAccept,
attributes: [['User-Name', username]]
attributes: [['User-Name', username]],
};
}
// Failed
return {
code: PacketResponseCode.AccessReject
code: PacketResponseCode.AccessReject,
};
}
}

6
src/radius/handler/eap/EAPHelper.ts
View File

@@ -15,7 +15,7 @@ export function buildEAP(identifier: number, msgType: number, data?: Buffer) {
identifier,
0, // length (1/2)
0, // length (2/2)
msgType // 1 = identity, 21 = EAP-TTLS, 2 = notificaiton, 4 = md5-challenge, 3 = NAK
msgType, // 1 = identity, 21 = EAP-TTLS, 2 = notificaiton, 4 = md5-challenge, 3 = NAK
]);
const resBuffer = data ? Buffer.concat([buffer, data]) : buffer;
@@ -38,7 +38,7 @@ export function buildEAPResponse(
): IPacketHandlerResult {
return {
code: PacketResponseCode.AccessChallenge,
attributes: [['EAP-Message', buildEAP(identifier, msgType, data)]]
attributes: [['EAP-Message', buildEAP(identifier, msgType, data)]],
};
}
@@ -74,6 +74,6 @@ export function decodeEAPHeader(msg: Buffer) {
identifier,
length,
type,
data
data,
};
}

4
src/radius/handler/eap/eapMethods/EAP-GTC.ts
View File

@@ -15,7 +15,7 @@ export class EAPGTC implements IEAPMethod {
}
extractValue(msg: Buffer) {
let tillBinary0 = msg.findIndex(v => v === 0) || msg.length;
let tillBinary0 = msg.findIndex((v) => v === 0) || msg.length;
if (tillBinary0 < 0) {
tillBinary0 = msg.length - 1;
}
@@ -52,7 +52,7 @@ export class EAPGTC implements IEAPMethod {
return {
code: success ? PacketResponseCode.AccessAccept : PacketResponseCode.AccessReject,
attributes: (success && [['User-Name', username]]) || undefined
attributes: (success && [['User-Name', username]]) || undefined,
};
}
}

38
src/radius/handler/eap/eapMethods/EAP-TTLS.ts
View File

@@ -14,7 +14,7 @@ import {
IPacketAttributes,
IPacketHandler,
IPacketHandlerResult,
PacketResponseCode
PacketResponseCode,
} from '../../../../types/PacketHandler';
import { MAX_RADIUS_ATTRIBUTE_SIZE, newDeferredPromise } from '../../../../helpers';
import { IEAPMethod } from '../../../../types/EAPMethod';
@@ -108,7 +108,7 @@ export class EAPTTLS implements IEAPMethod {
0, // length (1/2)
0, // length (2/2)
msgType, // 1 = identity, 21 = EAP-TTLS, 2 = notificaiton, 4 = md5-challenge, 3 = NAK
flags // flags: 000000 (L include lenghts, M .. more to come)
flags, // flags: 000000 (L include lenghts, M .. more to come)
]);
// append length
@@ -132,7 +132,7 @@ export class EAPTTLS implements IEAPMethod {
dataLength: (data && data.byteLength) || 0,
msgType: msgType.toString(10),
flags: `00000000${flags.toString(2)}`.substr(-8),
data
data,
});
if (dataToQueue) {
@@ -161,7 +161,7 @@ export class EAPTTLS implements IEAPMethod {
if (resBuffer.length > 0) {
attributes.push([
'EAP-Message',
resBuffer.slice(sentDataSize, sentDataSize + MAX_RADIUS_ATTRIBUTE_SIZE)
resBuffer.slice(sentDataSize, sentDataSize + MAX_RADIUS_ATTRIBUTE_SIZE),
]);
sentDataSize += MAX_RADIUS_ATTRIBUTE_SIZE;
}
@@ -169,7 +169,7 @@ export class EAPTTLS implements IEAPMethod {
return {
code: PacketResponseCode.AccessChallenge,
attributes
attributes,
};
}
@@ -212,7 +212,7 @@ export class EAPTTLS implements IEAPMethod {
// R
// reserved: flags & 0b00011000,
// V
version: flags & 0b00000111
version: flags & 0b00000111,
};
let msglength;
@@ -226,14 +226,14 @@ export class EAPTTLS implements IEAPMethod {
decodedFlags,
identifier,
msglength,
data
data,
// dataStr: data.toString()
});
return {
decodedFlags,
msglength,
data
data,
};
}
@@ -247,7 +247,7 @@ export class EAPTTLS implements IEAPMethod {
success ? 3 : 4, // 3.. success, 4... failure
identifier + 1,
0, // length (1/2)
4 // length (2/2)
4, // length (2/2)
]);
const attributes: any[] = [];
@@ -268,13 +268,13 @@ export class EAPTTLS implements IEAPMethod {
attributes.push([
'Vendor-Specific',
311,
[[16, encodeTunnelPW(keyingMaterial.slice(64), packet.authenticator, secret)]]
[[16, encodeTunnelPW(keyingMaterial.slice(64), packet.authenticator, secret)]],
]); // MS-MPPE-Send-Key
attributes.push([
'Vendor-Specific',
311,
[[17, encodeTunnelPW(keyingMaterial.slice(0, 64), packet.authenticator, secret)]]
[[17, encodeTunnelPW(keyingMaterial.slice(0, 64), packet.authenticator, secret)]],
]); // MS-MPPE-Recv-Key
} else {
console.error(
@@ -284,7 +284,7 @@ export class EAPTTLS implements IEAPMethod {
return {
code: success ? PacketResponseCode.AccessAccept : PacketResponseCode.AccessReject,
attributes
attributes,
};
}
@@ -338,7 +338,7 @@ export class EAPTTLS implements IEAPMethod {
// build attributes for packet handler
const attributes: IPacketAttributes = {};
AVPs.forEach(avp => {
AVPs.forEach((avp) => {
attributes[attr_id_to_name(avp.type)] = avp.data;
});
@@ -347,7 +347,7 @@ export class EAPTTLS implements IEAPMethod {
// handle incoming package via inner tunnel
const result = await this.innerTunnel.handlePacket(
{
attributes
attributes,
},
this.getEAPType()
);
@@ -367,15 +367,15 @@ export class EAPTTLS implements IEAPMethod {
...packet,
attributes: {
...packet.attributes,
...this.transformAttributesArrayToMap(result.attributes)
}
...this.transformAttributesArrayToMap(result.attributes),
},
}
)
);
return;
}
const eapMessage = result.attributes?.find(attr => attr[0] === 'EAP-Message');
const eapMessage = result.attributes?.find((attr) => attr[0] === 'EAP-Message');
if (!eapMessage) {
throw new Error('no eap message found');
}
@@ -456,7 +456,7 @@ export class EAPTTLS implements IEAPMethod {
// L
V: !!(flags & 0b10000000),
// M
M: !!(flags & 0b01000000)
M: !!(flags & 0b01000000),
};
// const length = buffer.slice(5, 8).readUInt16BE(0); // actually a Int24BE
@@ -478,7 +478,7 @@ export class EAPTTLS implements IEAPMethod {
decodedFlags,
length,
vendorId,
data
data,
});
// ensure length is a multiple of 4 octect