Merge pull request #46 from orlandos-nl/feature/fix-exec-sftp

Fix using Exec side-by-side with SFTP
orlandos-nl · Oct 1, 2023 · f12b31f · f12b31f
2 parents c0f4eea + 8615374
commit f12b31f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/Sources/Citadel/Exec/ExecHandler.swift b/Sources/Citadel/Exec/ExecHandler.swift
@@ -35,7 +35,7 @@ enum SSHServerError: Error {
 
 final class ExecHandler: ChannelDuplexHandler {
     typealias InboundIn = SSHChannelData
-    typealias InboundOut = ByteBuffer
+    typealias InboundOut = SSHChannelData
     typealias OutboundIn = SSHChannelData
     typealias OutboundOut = SSHChannelData
 
@@ -92,18 +92,7 @@ final class ExecHandler: ChannelDuplexHandler {
     }
 
     func channelRead(context: ChannelHandlerContext, data: NIOAny) {
-        let data = self.unwrapInboundIn(data)
-
-        guard case .byteBuffer(let bytes) = data.data else {
-            fatalError("Unexpected read type")
-        }
-
-        guard case .channel = data.type else {
-            context.fireErrorCaught(SSHServerError.invalidDataType)
-            return
-        }
-
-        context.fireChannelRead(self.wrapInboundOut(bytes))
+        context.fireChannelRead(data)
     }
 
     func write(context: ChannelHandlerContext, data: NIOAny, promise: EventLoopPromise<Void>?) {

diff --git a/Sources/Citadel/Server.swift b/Sources/Citadel/Server.swift
@@ -84,6 +84,10 @@ final class SubsystemHandler: ChannelDuplexHandler {
     func write(context: ChannelHandlerContext, data: NIOAny, promise: EventLoopPromise<Void>?) {
         context.write(data, promise: promise)
     }
+
+    deinit {
+        configured.fail(CitadelError.channelCreationFailed)
+    }
 }
 
 final class CitadelServerDelegate {