Skip to content

Reply to global requests when want_reply is true#1600

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
Rob-Hague merged 1 commit into from
Feb 19, 2025
Merged

Reply to global requests when want_reply is true #1600

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
10 changes: 4 additions & 6 deletions src/Renci.SshNet/Session.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -472,11 +472,6 @@ public string ClientVersion
/// </summary>
internal event EventHandler<MessageEventArgs<SuccessMessage>> UserAuthenticationSuccessReceived;

/// <summary>
/// Occurs when <see cref="GlobalRequestMessage"/> message received
/// </summary>
internal event EventHandler<MessageEventArgs<GlobalRequestMessage>> GlobalRequestReceived;

/// <summary>
/// Occurs when <see cref="RequestSuccessMessage"/> message received
/// </summary>
Expand DownExpand Up@@ -1681,7 +1676,10 @@ internal void OnUserAuthenticationPublicKeyReceived(PublicKeyMessage message)
/// <param name="message"><see cref="GlobalRequestMessage"/> message.</param>
internal void OnGlobalRequestReceived(GlobalRequestMessage message)
{
GlobalRequestReceived?.Invoke(this, new MessageEventArgs<GlobalRequestMessage>(message));
if (message.WantReply)
{
SendMessage(new RequestFailureMessage());
}
}

/// <summary>
Expand Down
36 changes: 35 additions & 1 deletion test/Renci.SshNet.Tests/Classes/SessionTest_Connected.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
using System;
using System.Linq;
using System.Net.Sockets;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading;

using Microsoft.VisualStudio.TestTools.UnitTesting;

using Moq;

using Renci.SshNet.Messages.Connection;
using Renci.SshNet.Messages.Transport;

namespace Renci.SshNet.Tests.Classes
Expand DownExpand Up@@ -59,7 +62,7 @@ public void ShouldNotIncludeStrictKexPseudoAlgorithmInSubsequentKex()

ServerListener.BytesReceived += ServerListener_BytesReceived;

void ServerListener_BytesReceived(byte[] bytesReceived, System.Net.Sockets.Socket socket)
void ServerListener_BytesReceived(byte[] bytesReceived, Socket socket)
{
if (bytesReceived.Length > 5 && bytesReceived[5] == 20)
{
Expand DownExpand Up@@ -106,6 +109,37 @@ public void SendMessageShouldSendPacketToServer()
Assert.AreEqual(1, ServerBytesReceivedRegister.Count);
}

[TestMethod]
[DataRow(true)]
[DataRow(false)]
public void UnknownGlobalRequestWithWantReply(bool wantReply)
{
Thread.Sleep(100);

ServerBytesReceivedRegister.Clear();

var globalRequest =
new GlobalRequestMessage(Encoding.ASCII.GetBytes("unknown-request"), wantReply).GetPacket(8, null);

ServerSocket.Send(globalRequest, 4, globalRequest.Length - 4, SocketFlags.None);

Thread.Sleep(100);

if (wantReply)
{
// Should have sent a failure reply.
Assert.AreEqual(1, ServerBytesReceivedRegister.Count);
Assert.AreEqual(82, ServerBytesReceivedRegister[0][5], "Expected to have sent SSH_MSG_REQUEST_FAILURE(82)");
}
else
{
// Should not have sent any reply.
Assert.AreEqual(0, ServerBytesReceivedRegister.Count);
}

Assert.AreEqual(0, ErrorOccurredRegister.Count);
}

[TestMethod]
public void SessionIdShouldReturnExchangeHashCalculatedFromKeyExchangeInitMessage()
{
Expand Down