Merge pull request #602 from vlakreeh/master

Add skipValidation flag for authentication
This commit is contained in:
Romain Beaumont 2018-12-02 19:05:31 +01:00 committed by GitHub
commit c6e55e80b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 17 deletions

View File

@ -84,6 +84,7 @@ Returns a `Client` instance and perform login.
* version : 1.8 or 1.9 or false (to auto-negotiate): default to 1.8 * version : 1.8 or 1.9 or false (to auto-negotiate): default to 1.8
* customPackets (optional) : an object index by version/state/direction/name, see client_custom_packet for an example * customPackets (optional) : an object index by version/state/direction/name, see client_custom_packet for an example
* hideErrors : do not display errors, default to false * hideErrors : do not display errors, default to false
* skipValidation : do not try to validate given session, defaults to false
## mc.Client(isServer,version,[customPackets]) ## mc.Client(isServer,version,[customPackets])

View File

@ -3,6 +3,7 @@ const UUID = require('uuid-1345')
module.exports = function (client, options) { module.exports = function (client, options) {
const clientToken = options.clientToken || (options.session && options.session.clientToken) || UUID.v4().toString() const clientToken = options.clientToken || (options.session && options.session.clientToken) || UUID.v4().toString()
const skipValidation = false || options.skipValidation
options.accessToken = null options.accessToken = null
options.haveCredentials = options.password != null || (clientToken != null && options.session != null) options.haveCredentials = options.password != null || (clientToken != null && options.session != null)
@ -21,6 +22,7 @@ module.exports = function (client, options) {
} }
if (options.session) { if (options.session) {
if (!skipValidation) {
yggdrasil.validate(options.session.accessToken, function (err) { yggdrasil.validate(options.session.accessToken, function (err) {
if (!err) { cb(null, options.session) } else { if (!err) { cb(null, options.session) } else {
yggdrasil.refresh(options.session.accessToken, options.session.clientToken, function (err, accessToken, data) { yggdrasil.refresh(options.session.accessToken, options.session.clientToken, function (err, accessToken, data) {
@ -38,6 +40,10 @@ module.exports = function (client, options) {
}) })
} }
}) })
} else {
// trust that the provided session is a working one
cb(null, options.session)
}
} else { } else {
yggdrasil.auth({ yggdrasil.auth({
user: options.username, user: options.username,

1
src/index.d.ts vendored
View File

@ -38,6 +38,7 @@ declare module 'minecraft-protocol' {
port?: number port?: number
username: string username: string
version?: string version?: string
skipValidation?: boolean
} }
export class Server extends EventEmitter { export class Server extends EventEmitter {