Skip to content

Correctly resize ByteBuffers #150

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

Merged
Lukasa merged 1 commit into from
Jun 29, 2023
Merged

Correctly resize ByteBuffers #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Sources/NIOSSH/ByteBuffer+SSH.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ extension ByteBuffer {
mutating func writeCompositeSSHString(_ compositeFunction: (inout ByteBuffer) throws -> Int) rethrows -> Int {
// Reserve 4 bytes for the length.
let originalWriterIndex = self.writerIndex
self.moveWriterIndex(forwardBy: 4)
self.writeInteger(UInt32(0))

var writtenLength: Int
do {
Expand Down
2 changes: 1 addition & 1 deletion Sources/NIOSSH/SSHPacketSerializer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ extension ByteBuffer {
/// byte[m] mac (Message Authentication Code - MAC); m = mac_length

/// payload
self.moveWriterIndex(forwardBy: 5)
self.writeMultipleIntegers(UInt32(0), UInt8(0))
Copy link
Contributor

@glbrntt glbrntt Jun 29, 2023

Choose a reason for hiding this comment

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

nit: there's also writeRepeatedBytes (or something similar to that) which might be a teeny tiny bit more obvious.

Copy link
Contributor Author

@Lukasa Lukasa Jun 29, 2023

Choose a reason for hiding this comment

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

Oh I actually thought this one made more sense given the packet format laid out above.

Copy link
Contributor

@glbrntt glbrntt Jun 29, 2023

Choose a reason for hiding this comment

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

Makes sense, I was looking at it as the diff from “move the writer by 5”.

let messageLength = self.writeSSHMessage(message)

// Depending on on whether packet length is encrypted, padding should reflect that
Expand Down
27 changes: 27 additions & 0 deletions Tests/NIOSSHTests/ByteBuffer+SSHTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,33 @@ final class ByteBufferSSHTests: XCTestCase {

XCTAssertNoThrow(XCTAssertNotNil(try buffer.readSSHHostKey()))
}

func testCompositeStringDoesTheRightThingWithBB() throws {
var buffer = ByteBuffer()
XCTAssertEqual(buffer.capacity, 0)

buffer.writeCompositeSSHString {
$0.writeInteger(UInt64(9))
}
let writtenBytes = buffer.readBytes(length: buffer.readableBytes)
XCTAssertEqual(
writtenBytes,
[0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 9]
)
}

func testWriteSSHPacketDoesTheRightThingWithBB() throws {
var buffer = ByteBuffer()
XCTAssertEqual(buffer.capacity, 0)

buffer.writeSSHPacket(message: .version("Tests_v1.0"), lengthEncrypted: false, blockSize: 8)

let writtenBytes = buffer.readBytes(length: 5)
XCTAssertEqual(
writtenBytes,
[0, 0, 0, 24, 11]
)
}
}

extension ByteBuffer {
Expand Down