AstralTransRocketries/node-minecraft-protocol
1
0
Fork 0
mirror of https://github.com/unmojang/node-minecraft-protocol.git synced 2025-09-29 22:23:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move onEncryptionKeyRequest to client/encryption

Browse Source
This commit is contained in:
deathcap 2016-01-25 23:11:42 -08:00
parent 609c4466f7
commit cbaaeb8eb2
2 changed files with 67 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/client/encrypt.js Normal file
View File

@ -0,0 +1,65 @@
var crypto = require('crypto');
var yggserver = require('yggdrasil').server({});
var debug = require("../debug");
module.exports = function(client) {
client.once('encryption_begin', onEncryptionKeyRequest);
function onEncryptionKeyRequest(packet) {
crypto.randomBytes(16, gotSharedSecret);
function gotSharedSecret(err, sharedSecret) {
if(err) {
debug(err);
client.emit('error', err);
client.end();
return;
}
if(haveCredentials) {
joinServerRequest(onJoinServerResponse);
} else {
if(packet.serverId != '-') {
debug('This server appears to be an online server and you are providing no password, the authentication will probably fail');
}
sendEncryptionKeyResponse();
}
function onJoinServerResponse(err) {
if(err) {
client.emit('error', err);
client.end();
} else {
sendEncryptionKeyResponse();
}
}
function joinServerRequest(cb) {
yggserver.join(accessToken, client.session.selectedProfile.id,
packet.serverId, sharedSecret, packet.publicKey, cb);
}
function sendEncryptionKeyResponse() {
var pubKey = mcPubKeyToURsa(packet.publicKey);
var encryptedSharedSecretBuffer = pubKey.encrypt(sharedSecret, undefined, undefined, ursa.RSA_PKCS1_PADDING);
var encryptedVerifyTokenBuffer = pubKey.encrypt(packet.verifyToken, undefined, undefined, ursa.RSA_PKCS1_PADDING);
client.write('encryption_begin', {
sharedSecret: encryptedSharedSecretBuffer,
verifyToken: encryptedVerifyTokenBuffer
});
client.setEncryption(sharedSecret);
}
}
}
};
function mcPubKeyToURsa(mcPubKeyBuffer) {
var pem = "-----BEGIN PUBLIC KEY-----\n";
var base64PubKey = mcPubKeyBuffer.toString('base64');
var maxLineLength = 65;
while(base64PubKey.length > 0) {
pem += base64PubKey.substring(0, maxLineLength) + "\n";
base64PubKey = base64PubKey.substring(maxLineLength);
}
pem += "-----END PUBLIC KEY-----\n";
return ursa.createPublicKey(pem, 'utf8');
}

51
src/createClient.js
View File

@ -3,12 +3,11 @@ var net = require('net');
var dns = require('dns'); var dns = require('dns');
var Client = require('./client'); var Client = require('./client');
var assert = require('assert'); var assert = require('assert');
var crypto = require('crypto');
var yggdrasil = require('yggdrasil')({}); var yggdrasil = require('yggdrasil')({});
var yggserver = require('yggdrasil').server({});
var states = require("./states"); var states = require("./states");
var debug = require("./debug"); var debug = require("./debug");
var UUID = require('uuid-1345'); var UUID = require('uuid-1345');
var encrypt = require('./client/encrypt');
module.exports=createClient; module.exports=createClient;
@ -47,7 +46,7 @@ function createClient(options) {
var client = new Client(false,version.majorVersion); var client = new Client(false,version.majorVersion);
client.on('connect', onConnect); client.on('connect', onConnect);
if(keepAlive) client.on('keep_alive', onKeepAlive); if(keepAlive) client.on('keep_alive', onKeepAlive);
client.once('encryption_begin', onEncryptionKeyRequest); encrypt(client);
client.once('success', onLogin); client.once('success', onLogin);
client.once("compress", onCompressionRequest); client.once("compress", onCompressionRequest);
client.on("set_compression", onCompressionRequest); client.on("set_compression", onCompressionRequest);
@ -114,52 +113,6 @@ function createClient(options) {
}); });
} }
function onEncryptionKeyRequest(packet) {
crypto.randomBytes(16, gotSharedSecret);
function gotSharedSecret(err, sharedSecret) {
if(err) {
debug(err);
client.emit('error', err);
client.end();
return;
}
if(haveCredentials) {
joinServerRequest(onJoinServerResponse);
} else {
if(packet.serverId != '-') {
debug('This server appears to be an online server and you are providing no password, the authentication will probably fail');
}
sendEncryptionKeyResponse();
}
function onJoinServerResponse(err) {
if(err) {
client.emit('error', err);
client.end();
} else {
sendEncryptionKeyResponse();
}
}
function joinServerRequest(cb) {
yggserver.join(accessToken, client.session.selectedProfile.id,
packet.serverId, sharedSecret, packet.publicKey, cb);
}
function sendEncryptionKeyResponse() {
var pubKey = mcPubKeyToURsa(packet.publicKey);
var encryptedSharedSecretBuffer = pubKey.encrypt(sharedSecret, undefined, undefined, ursa.RSA_PKCS1_PADDING);
var encryptedVerifyTokenBuffer = pubKey.encrypt(packet.verifyToken, undefined, undefined, ursa.RSA_PKCS1_PADDING);
client.write('encryption_begin', {
sharedSecret: encryptedSharedSecretBuffer,
verifyToken: encryptedVerifyTokenBuffer
});
client.setEncryption(sharedSecret);
}
}
}
function onLogin(packet) { function onLogin(packet) {
client.state = states.PLAY; client.state = states.PLAY;
client.uuid = packet.uuid; client.uuid = packet.uuid;