Merge remote-tracking branch 'origin/raw' into raw

Carlos Cabanero · Carlos Cabanero · commit 8283a20edf3f · 2024-03-11T16:38:40.000-04:00
diff --git a/Blink.xcodeproj/project.pbxproj b/Blink.xcodeproj/project.pbxproj
@@ -911,6 +911,7 @@
 		BDD6D148275951D900E76F1F /* BKGlobalSSHConfig.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BKGlobalSSHConfig.swift; sourceTree = "<group>"; };
 		BDE7125C2A141E3100164F70 /* SSHAgentUserPrompt.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SSHAgentUserPrompt.swift; sourceTree = "<group>"; };
 		BDE7C45B29DCAEFA005E033E /* FileLocationPathTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileLocationPathTests.swift; sourceTree = "<group>"; };
+		BDEEE36B2B8951D3003003FD /* get_frameworks.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = get_frameworks.sh; sourceTree = "<group>"; };
 		C94437551D8311960096F84E /* BKResource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BKResource.h; sourceTree = "<group>"; };
 		C94437561D8311960096F84E /* BKResource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BKResource.m; sourceTree = "<group>"; };
 		C944375F1D831CD30096F84E /* Themes */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Themes; sourceTree = "<group>"; };
@@ -2309,6 +2310,7 @@
 		EA0BA1821C0CC57B00719C1A = {
 			isa = PBXGroup;
 			children = (
+				BDEEE36B2B8951D3003003FD /* get_frameworks.sh */,
 				D23FFC69261C2D46003E9227 /* template_setup.xcconfig */,
 				D27D01232615F1BD00128C23 /* developer_setup.xcconfig */,
 				D2C243F7238E44960082C69C /* KB */,
diff --git a/Blink/Commands/mosh/MoshBootstrap.swift b/Blink/Commands/mosh/MoshBootstrap.swift
@@ -134,7 +134,7 @@ extension Architecture {
   public var downloadableDescription: String {
     switch self {
     case .X86_64:
-      return "x86_64"
+      return "amd64"
     case .Aarch64:
       return "arm64"
     case .Arm64:
diff --git a/Blink/SpaceController.swift b/Blink/SpaceController.swift
@@ -38,6 +38,7 @@ import MBProgressHUD
 import SwiftUI
 
 
+// MARK: UIViewController
 class SpaceController: UIViewController {
   
   struct UIState: UserActivityCodable {
@@ -536,6 +537,7 @@ class SpaceController: UIViewController {
   
 }
 
+// MARK: UIStateRestorable
 extension SpaceController: UIStateRestorable {
   func restore(withState state: UIState) {
     _viewportsKeys = state.keys
@@ -566,6 +568,7 @@ extension SpaceController: UIStateRestorable {
   }
 }
 
+// MARK: UIPageViewControllerDelegate
 extension SpaceController: UIPageViewControllerDelegate {
   public func pageViewController(
     _ pageViewController: UIPageViewController,
@@ -586,6 +589,7 @@ extension SpaceController: UIPageViewControllerDelegate {
   }
 }
 
+// MARK: UIPageViewControllerDataSource
 extension SpaceController: UIPageViewControllerDataSource {
   private func _controller(controller: UIViewController, advancedBy: Int) -> UIViewController? {
     guard let ctrl = controller as? TermController else {
@@ -616,6 +620,7 @@ extension SpaceController: UIPageViewControllerDataSource {
   
 }
 
+// MARK: TermControlDelegate
 extension SpaceController: TermControlDelegate {
   
   func terminalHangup(control: TermController) {
@@ -1146,6 +1151,7 @@ extension SpaceController {
   
 }
 
+// MARK: CommandsHUDDelegate
 extension SpaceController: CommandsHUDDelegate {
   @objc func currentTerm() -> TermController? {
     if let currentKey = _currentKey {
@@ -1157,6 +1163,8 @@ extension SpaceController: CommandsHUDDelegate {
   @objc func spaceController() -> SpaceController? { self }
 }
 
+// MARK: SnippetContext
+
 extension SpaceController: SnippetContext {
   
   func _presentSnippetsController(receiver: SpaceController) {
diff --git a/SSH/SSHClient.swift b/SSH/SSHClient.swift
@@ -276,7 +276,14 @@ public class SSHClient {
         let command = String(cString: cmd!)
         // Will break if unconfigured. It can be considered
         // a code error.
-        return ctxt.proxyCb!(command, inSock, outSock)
+        guard let proxyCb = ctxt.proxyCb else {
+          ctxt.log.message("No proxy callback configured. Cannot run ProxyCommand", SSH_LOG_WARN)
+          shutdown(inSock, SHUT_RDWR)
+          shutdown(outSock, SHUT_RDWR)
+          return
+        }
+        
+        return proxyCb(command, inSock, outSock)
       }
     }
     

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ import MBProgressHUD`
`38`	`38`	`import SwiftUI`
`39`	`39`
`40`	`40`
	`41`	`+// MARK: UIViewController`
`41`	`42`	`class SpaceController: UIViewController {`
`42`	`43`
`43`	`44`	`struct UIState: UserActivityCodable {`
`@@ -536,6 +537,7 @@ class SpaceController: UIViewController {`
`536`	`537`
`537`	`538`	`}`
`538`	`539`
	`540`	`+// MARK: UIStateRestorable`
`539`	`541`	`extension SpaceController: UIStateRestorable {`
`540`	`542`	`func restore(withState state: UIState) {`
`541`	`543`	`_viewportsKeys = state.keys`
`@@ -566,6 +568,7 @@ extension SpaceController: UIStateRestorable {`
`566`	`568`	`}`
`567`	`569`	`}`
`568`	`570`
	`571`	`+// MARK: UIPageViewControllerDelegate`
`569`	`572`	`extension SpaceController: UIPageViewControllerDelegate {`
`570`	`573`	`public func pageViewController(`
`571`	`574`	`_ pageViewController: UIPageViewController,`
`@@ -586,6 +589,7 @@ extension SpaceController: UIPageViewControllerDelegate {`
`586`	`589`	`}`
`587`	`590`	`}`
`588`	`591`
	`592`	`+// MARK: UIPageViewControllerDataSource`
`589`	`593`	`extension SpaceController: UIPageViewControllerDataSource {`
`590`	`594`	`private func _controller(controller: UIViewController, advancedBy: Int) -> UIViewController? {`
`591`	`595`	`guard let ctrl = controller as? TermController else {`
`@@ -616,6 +620,7 @@ extension SpaceController: UIPageViewControllerDataSource {`
`616`	`620`
`617`	`621`	`}`
`618`	`622`
	`623`	`+// MARK: TermControlDelegate`
`619`	`624`	`extension SpaceController: TermControlDelegate {`
`620`	`625`
`621`	`626`	`func terminalHangup(control: TermController) {`
`@@ -1146,6 +1151,7 @@ extension SpaceController {`
`1146`	`1151`
`1147`	`1152`	`}`
`1148`	`1153`
	`1154`	`+// MARK: CommandsHUDDelegate`
`1149`	`1155`	`extension SpaceController: CommandsHUDDelegate {`
`1150`	`1156`	`@objc func currentTerm() -> TermController? {`
`1151`	`1157`	`if let currentKey = _currentKey {`
`@@ -1157,6 +1163,8 @@ extension SpaceController: CommandsHUDDelegate {`
`1157`	`1163`	`@objc func spaceController() -> SpaceController? { self }`
`1158`	`1164`	`}`
`1159`	`1165`
	`1166`	`+// MARK: SnippetContext`
	`1167`	`+`
`1160`	`1168`	`extension SpaceController: SnippetContext {`
`1161`	`1169`
`1162`	`1170`	`func _presentSnippetsController(receiver: SpaceController) {`