Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: include instance name in Login7 message and traceID in prelogin #1668

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

fix: include instance name in Login7 message and traceID in prelogin #1668

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8db7c47
fix packet
TPVallancourt Oct 29, 2024
08f8110
instance
TPVallancourt Oct 30, 2024
014629c
Merge branch 'master' into tpvallancourt/fix-login7
TPVallancourt Nov 5, 2024
a951cb5
trace id
TPVallancourt Dec 5, 2024
dfe3d4e
handle empty instance
TPVallancourt Jan 22, 2025
12af235
does instance name caues the build to fail?
TPVallancourt Jan 22, 2025
ef04a45
Revert "does instance name caues the build to fail?"
TPVallancourt Jan 23, 2025
4793d3f
is it the payload
TPVallancourt Jan 23, 2025
ea53c6f
Revert "is it the payload"
TPVallancourt Jan 23, 2025
e800a35
gate on tds version
TPVallancourt Jan 23, 2025
b185dce
fix offset
TPVallancourt Jan 23, 2025
80421f2
Revert "fix offset"
TPVallancourt Jan 23, 2025
005f1b8
Revert "gate on tds version"
TPVallancourt Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/connection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -873,6 +873,7 @@ export interface ConnectionOptions {
interface RoutingData {
server: string;
port: number;
instance: string;
}

/**
Expand Down Expand Up @@ -2484,7 +2485,7 @@ class Connection extends EventEmitter {
}

payload.hostname = this.config.options.workstationId || os.hostname();
payload.serverName = this.routingData ? this.routingData.server : this.config.server;
payload.serverName = this.routingData ? `${this.routingData.server}\\${this.routingData.instance}` : this.config.server;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is instance here guaranteed to always be a non-empty string? What happens if it's empty?

payload.appName = this.config.options.appName || 'Tedious';
payload.libraryName = libraryName;
payload.language = this.config.options.language;
Expand Down
16 changes: 10 additions & 6 deletions src/login7-payload.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,15 +251,12 @@ class Login7Payload {
}

// (ibUnused / ibExtension): 2-byte
offset = fixedData.writeUInt16LE(dataOffset, offset);
const extensionOffsetHeaderOffset = offset;
offset = fixedData.writeUInt16LE(0, offset);


// (cchUnused / cbExtension): 2-byte
const extensions = this.buildFeatureExt();
offset = fixedData.writeUInt16LE(4, offset);
const extensionOffset = Buffer.alloc(4);
extensionOffset.writeUInt32LE(dataOffset += 4, 0);
dataOffset += extensions.length;
buffers.push(extensionOffset, extensions);

// ibCltIntName: 2-byte
offset = fixedData.writeUInt16LE(dataOffset, offset);
Expand Down Expand Up @@ -365,6 +362,13 @@ class Login7Payload {
fixedData.writeUInt32LE(0, offset);
}

fixedData.writeUInt16LE(dataOffset, extensionOffsetHeaderOffset);

const extensions = this.buildFeatureExt();
const extensionOffset = Buffer.alloc(4);
extensionOffset.writeUInt32LE(dataOffset + 4, 0);
buffers.push(extensionOffset, extensions);

const data = Buffer.concat(buffers);
data.writeUInt32LE(data.length, 0);
return data;
Expand Down
6 changes: 3 additions & 3 deletions src/token/handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ export class Login7TokenHandler extends TokenHandler {
declare connection: Connection;

declare fedAuthInfoToken: FedAuthInfoToken | undefined;
declare routingData: { server: string, port: number } | undefined;
declare routingData: { server: string, port: number, instance: string } | undefined;

declare loginAckReceived: boolean;

Expand Down Expand Up @@ -337,10 +337,10 @@ export class Login7TokenHandler extends TokenHandler {

onRoutingChange(token: RoutingEnvChangeToken) {
// Removes instance name attached to the redirect url. E.g., redirect.db.net\instance1 --> redirect.db.net
const [ server ] = token.newValue.server.split('\\');
const [ server, instance ] = token.newValue.server.split('\\');

this.routingData = {
server, port: token.newValue.port
server, port: token.newValue.port, instance
};
}

Expand Down
Loading