From 9c6fab1780fc35a0e5fba231ed552034fcbe7471 Mon Sep 17 00:00:00 2001 From: "Howard P. Logsdon" Date: Fri, 7 Mar 2014 12:14:15 -0700 Subject: Enable SSL over SSH connection configuration. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This appears to work, as I’m able to connect to mysql instances through an ssh tunnel, with ssl configuration, but I probably should wireshark the connection to determine actual network traffic. --- Interfaces/English.lproj/ConnectionView.xib | 2609 +++++++++++++++++++++------ Source/SPConnectionController.h | 4 + Source/SPConnectionController.m | 13 +- 3 files changed, 2036 insertions(+), 590 deletions(-) diff --git a/Interfaces/English.lproj/ConnectionView.xib b/Interfaces/English.lproj/ConnectionView.xib index 422d8188..16a76fb5 100644 --- a/Interfaces/English.lproj/ConnectionView.xib +++ b/Interfaces/English.lproj/ConnectionView.xib @@ -2,10 +2,10 @@ 1060 - 13B3116 + 13C64 4514 - 1265 - 696.00 + 1265.19 + 697.40 com.apple.InterfaceBuilder.CocoaPlugin 4514 @@ -54,7 +54,7 @@ NSApplication - + 274 @@ -78,6 +78,8 @@ {{0, 1}, {202, 22}} + + YES 134217728 @@ -99,6 +101,8 @@ 292 {{61, -1}, {32, 25}} + + YES 67108864 @@ -128,6 +132,8 @@ 292 {{30, -1}, {32, 25}} + + YES 67108864 @@ -153,6 +159,8 @@ 292 {{-1, -1}, {36, 25}} + + YES 71303232 @@ -384,6 +392,8 @@ {{187, 1}, {15, 22}} + + YES 134217728 @@ -413,6 +423,8 @@ 4352 {202, 489} + + YES NO YES @@ -511,6 +523,7 @@ {202, 489} + @@ -524,6 +537,8 @@ -2147483392 {{229, 1}, {15, 524}} + + NO _doScroller: @@ -534,6 +549,8 @@ -2147483392 {{1, 525}, {228, 15}} + + NO 1 @@ -543,6 +560,7 @@ {{0, 23}, {202, 489}} + 133680 @@ -556,6 +574,8 @@ {202, 513} + + YES @@ -587,6 +607,8 @@ 268 {{158.5, 3}, {125, 28}} + + YES 67108864 @@ -608,6 +630,8 @@ 268 {{15, 3}, {145, 28}} + + YES 67108864 @@ -629,6 +653,8 @@ 265 {{286, 3}, {145, 28}} + + YES 67108864 @@ -648,6 +674,8 @@ {446, 37} + + NSView @@ -655,12 +683,14 @@ 274 {{13, 61}, {420, 417}} + + 1 - 256 + 274 @@ -671,6 +701,7 @@ 268 {{110, 208}, {247, 22}} + SPColorSelectorView @@ -678,6 +709,7 @@ 268 {{108, 14}, {251, 18}} + YES 67108864 @@ -706,6 +738,7 @@ 268 {{110, 178}, {247, 22}} + YES -1804599231 @@ -738,6 +771,7 @@ 268 {{7, 180}, {98, 17}} + YES 68157504 @@ -764,6 +798,7 @@ 268 {{110, 238}, {247, 22}} + YES -1804599231 @@ -784,6 +819,7 @@ 268 {{7, 240}, {98, 17}} + YES 68157504 @@ -802,6 +838,7 @@ 268 {{110, 144}, {247, 22}} + YES -1804599231 @@ -821,6 +858,7 @@ 268 {{7, 146}, {98, 17}} + YES 68157504 @@ -839,6 +877,7 @@ 268 {{110, 110}, {247, 22}} + YES -1804599231 @@ -858,6 +897,7 @@ 268 {{7, 112}, {98, 17}} + YES 68157504 @@ -876,6 +916,7 @@ 268 {{110, 76}, {247, 22}} + YES -1804599231 @@ -896,6 +937,7 @@ 268 {{7, 78}, {98, 17}} + YES 68157504 @@ -914,6 +956,7 @@ 268 {{110, 42}, {247, 22}} + YES -1804599231 @@ -934,6 +977,7 @@ 268 {{7, 44}, {98, 17}} + YES 68157504 @@ -950,6 +994,7 @@ {{6, 101}, {377, 287}} + NSView @@ -961,6 +1006,7 @@ 268 {{-3, 15}, {107, 17}} + YES 68157504 @@ -979,6 +1025,7 @@ 268 {{109, 13}, {220, 22}} + YES -2074083263 @@ -1003,6 +1050,7 @@ 268 {{328, 12}, {29, 24}} + YES 67108864 @@ -1032,6 +1080,7 @@ 268 {{-3, 49}, {107, 17}} + YES 68157504 @@ -1050,6 +1099,7 @@ 268 {{109, 47}, {220, 22}} + YES -2074083263 @@ -1074,6 +1124,7 @@ 268 {{328, 46}, {29, 24}} + YES 67108864 @@ -1097,6 +1148,7 @@ 268 {{-3, 83}, {107, 17}} + YES 68157504 @@ -1115,6 +1167,7 @@ 268 {{109, 81}, {220, 22}} + YES -2074083263 @@ -1138,6 +1191,7 @@ 268 {{328, 80}, {29, 24}} + YES 67108864 @@ -1159,10 +1213,12 @@ {{6, -3}, {377, 104}} + NSView {{10, 33}, {400, 371}} + Standard @@ -1172,7 +1228,7 @@ 2 - 256 + 274 @@ -1183,6 +1239,7 @@ 268 {{110, 167}, {247, 22}} + SPColorSelectorView @@ -1190,6 +1247,7 @@ 268 {{108, 7}, {251, 18}} + YES 67108864 @@ -1213,6 +1271,7 @@ 268 {{110, 137}, {247, 22}} + YES -1804599231 @@ -1232,6 +1291,7 @@ 268 {{7, 139}, {98, 17}} + YES 68157504 @@ -1250,6 +1310,7 @@ 268 {{110, 103}, {247, 22}} + YES -1804599231 @@ -1269,6 +1330,7 @@ 268 {{7, 105}, {98, 17}} + YES 68157504 @@ -1287,6 +1349,7 @@ 268 {{110, 69}, {247, 22}} + YES -1804599231 @@ -1307,6 +1370,7 @@ 268 {{7, 71}, {98, 17}} + YES 68157504 @@ -1325,6 +1389,7 @@ 268 {{110, 35}, {247, 22}} + YES -1804599231 @@ -1345,6 +1410,7 @@ 268 {{7, 37}, {98, 17}} + YES 68157504 @@ -1363,6 +1429,7 @@ 268 {{110, 197}, {247, 22}} + YES -1804599231 @@ -1383,6 +1450,7 @@ 268 {{7, 199}, {98, 17}} + YES 68157504 @@ -1399,6 +1467,7 @@ {{6, 142}, {377, 246}} + NSView @@ -1410,6 +1479,7 @@ 268 {{-3, 15}, {107, 17}} + YES 68157504 @@ -1428,6 +1498,7 @@ 268 {{109, 13}, {220, 22}} + YES -2074083263 @@ -1452,6 +1523,7 @@ 268 {{328, 12}, {29, 24}} + YES 67108864 @@ -1475,6 +1547,7 @@ 268 {{-3, 49}, {107, 17}} + YES 68157504 @@ -1493,6 +1566,7 @@ 268 {{109, 47}, {220, 22}} + YES -2074083263 @@ -1517,6 +1591,7 @@ 268 {{328, 46}, {29, 24}} + YES 67108864 @@ -1540,6 +1615,7 @@ 268 {{-3, 83}, {107, 17}} + YES 68157504 @@ -1558,6 +1634,7 @@ 268 {{109, 81}, {220, 22}} + YES -2074083263 @@ -1581,6 +1658,7 @@ 268 {{328, 80}, {29, 24}} + YES 67108864 @@ -1602,10 +1680,12 @@ {{6, 38}, {377, 104}} + NSView {{10, 33}, {400, 371}} + Socket @@ -1621,18 +1701,47 @@ 269 + + + 268 + {{108, 3}, {251, 18}} + + + + YES + + 67108864 + 0 + Connect using SSL + + + 1211912448 + 2 + + + + + 200 + 25 + + NO + 268 - {{110, 332}, {247, 22}} + {{110, 343}, {247, 22}} + + SPColorSelectorView 268 - {{110, 302}, {247, 22}} + {{110, 313}, {247, 22}} + + YES -1804599231 @@ -1650,8 +1759,10 @@ 268 - {{7, 304}, {98, 17}} + {{7, 315}, {98, 17}} + + YES 68157504 @@ -1668,8 +1779,10 @@ 268 - {{110, 268}, {247, 22}} + {{110, 279}, {247, 22}} + + YES -1804599231 @@ -1687,8 +1800,10 @@ 268 - {{7, 270}, {98, 17}} + {{7, 281}, {98, 17}} + + YES 68157504 @@ -1705,8 +1820,10 @@ 268 - {{110, 234}, {247, 22}} + {{110, 245}, {247, 22}} + + YES -1804599231 @@ -1724,8 +1841,10 @@ 268 - {{7, 236}, {98, 17}} + {{7, 247}, {98, 17}} + + YES 68157504 @@ -1742,8 +1861,10 @@ 268 - {{110, 200}, {247, 22}} + {{110, 211}, {247, 22}} + + YES -1804599231 @@ -1762,8 +1883,10 @@ 268 - {{7, 202}, {98, 17}} + {{7, 213}, {98, 17}} + + YES 68157504 @@ -1780,8 +1903,10 @@ 268 - {{110, 166}, {247, 22}} + {{110, 177}, {247, 22}} + + YES -1804599231 @@ -1800,8 +1925,10 @@ 268 - {{10, 168}, {95, 17}} + {{10, 179}, {95, 17}} + + YES 68157504 @@ -1818,8 +1945,10 @@ 268 - {{110, 118}, {247, 22}} + {{110, 129}, {247, 22}} + + YES -1804599231 @@ -1837,8 +1966,10 @@ 268 - {{10, 120}, {95, 17}} + {{10, 131}, {95, 17}} + + YES 68157504 @@ -1855,8 +1986,10 @@ 268 - {{110, 84}, {247, 22}} + {{110, 95}, {247, 22}} + + YES -1804599231 @@ -1874,8 +2007,10 @@ 268 - {{7, 86}, {98, 17}} + {{7, 97}, {98, 17}} + + YES 68157504 @@ -1892,8 +2027,10 @@ 268 - {{110, 50}, {219, 22}} + {{110, 61}, {219, 22}} + + YES -1804599231 @@ -1911,8 +2048,10 @@ 268 - {{7, 52}, {98, 17}} + {{7, 63}, {98, 17}} + + YES 68157504 @@ -1929,8 +2068,10 @@ 268 - {{110, 16}, {247, 22}} + {{110, 27}, {247, 22}} + + YES -1804599231 @@ -1949,8 +2090,10 @@ 268 - {{7, 18}, {98, 17}} + {{7, 29}, {98, 17}} + + YES 68157504 @@ -1967,8 +2110,10 @@ 268 - {{110, 362}, {247, 22}} + {{110, 373}, {247, 22}} + + YES -1804599231 @@ -1987,8 +2132,10 @@ 268 - {{7, 364}, {98, 17}} + {{7, 375}, {98, 17}} + + YES 68157504 @@ -2005,8 +2152,10 @@ 268 - {{328, 49}, {29, 24}} + {{328, 60}, {29, 24}} + + YES 67108864 @@ -2028,8 +2177,10 @@ 268 - {{7, 52}, {98, 17}} + {{7, 63}, {98, 17}} + + YES 68157504 @@ -2046,8 +2197,10 @@ 268 - {{110, 50}, {219, 22}} + {{110, 61}, {219, 22}} + + YES -2076180416 @@ -2066,13 +2219,240 @@ 1 - {{6, -23}, {377, 411}} + {{12, -34}, {377, 422}} + + + + NSView + + + + 268 + + + + 268 + {{-3, 15}, {107, 17}} + + + + YES + + 68157504 + 71304192 + CA Cert: + + + + + + NO + 1 + + + + 268 + {{109, 13}, {220, 22}} + + + + YES + + -2074083263 + 272631296 + + + none set + + YES + + + 3 + MC41AA + + + + NO + 1 + + + + 268 + {{328, 12}, {29, 24}} + + + + YES + + 67108864 + 134217728 + + + + -922992640 + 34 + + + + + 400 + 75 + + NO + + + + 268 + {{-3, 49}, {107, 17}} + + + + YES + + 68157504 + 71304192 + Certificate: + + + + + + NO + 1 + + + + 268 + {{109, 47}, {220, 22}} + + + + YES + + -2074083263 + 272631296 + + + none set + + YES + + + 3 + MC41AA + + + + NO + 1 + + + + 268 + {{328, 46}, {29, 24}} + + + + YES + + 67108864 + 134217728 + + + + -922992640 + 34 + + + + + 400 + 75 + + NO + + + + 268 + {{-3, 83}, {107, 17}} + + + + YES + + 68157504 + 71304192 + Key File: + + + + + + NO + 1 + + + + 268 + {{109, 81}, {220, 22}} + + + + YES + + -2074083263 + 272631296 + + + none set + + YES + + + 3 + MC41MDQwMzIyNTQyAA + + + NO + 1 + + + + 268 + {{328, 80}, {29, 24}} + + + + YES + + 67108864 + 134217728 + + + + -922992640 + 34 + + + + + 400 + 75 + + NO + + + {{12, -146}, {377, 104}} + + NSView {{10, 33}, {400, 371}} + + SSH @@ -2093,6 +2473,8 @@ 289 {{285, 33}, {147, 32}} + + YES 67108864 @@ -2114,6 +2496,8 @@ 1316 {{20, 43}, {16, 16}} + + 28938 16 100 @@ -2123,6 +2507,8 @@ -2147483356 {{41, 43}, {252, 17}} + + YES 68157504 @@ -2141,6 +2527,8 @@ 292 {{15, 37}, {25, 25}} + + YES -2080374784 @@ -2160,16 +2548,21 @@ {{116, 5}, {446, 472}} + + NSCustomView {679, 480} + + SPFlippedView {679, 481} + @@ -2178,19 +2571,22 @@ -2147483392 - {{664, 0}, {15, 466}} + {{663, 0}, {16, 580}} + + NO _doScroller: 1 - 1 + 0.99827882960413084 -2147483392 {{0, 466}, {663, 15}} + NO 1 @@ -2200,6 +2596,7 @@ {679, 481} + 133680 @@ -2214,6 +2611,8 @@ 266 {{17, 489}, {645, 17}} + + YES 68157504 @@ -2234,17 +2633,24 @@ {{203, 0}, {679, 513}} + + YES {882, 513} + + YES 2 DBViewSplitter {882, 513} + + + SPFlippedView @@ -2555,7 +2961,7 @@ {580, 320} - {{0, 0}, {1440, 878}} + {{0, 0}, {1680, 1028}} {100, 119} {10000000000000, 10000000000000} @@ -3223,14 +3629,6 @@ 5880 - - - socketSSLKeyFileButton - - - - 5727 - standardConnectionSSLDetailsContainer @@ -3519,6 +3917,78 @@ 5893 + + + chooseKeyLocation: + + + + Cyu-po-GQE + + + + chooseKeyLocation: + + + + cQ2-mu-0Ph + + + + updateSSLInterface: + + + + KEh-s5-TWL + + + + sshConnectionSSLDetailsContainer + + + + K8K-hl-nke + + + + chooseKeyLocation: + + + + zge-vf-RDs + + + + sslOverSSHKeyFileButton + + + + VTR-AE-QPt + + + + sslOverSSHCertificateButton + + + + Ync-fQ-3aq + + + + sslOverSSHCACertButton + + + + 1Wh-DE-z2l + + + + socketSSLKeyFileButton + + + + nQE-St-ai8 + delegate @@ -4915,26 +5385,245 @@ 5902 - - - - - 0 - - - - - - -1 - - - First Responder - - - -2 - - - File's Owner + + + value: sslCertificateFileLocation + + + + + + value: sslCertificateFileLocation + value + sslCertificateFileLocation + + NSNullPlaceholder + none set + + 2 + + + aQT-Hc-RZK + + + + toolTip: sslCertificateFileLocation + + + + + + toolTip: sslCertificateFileLocation + toolTip + sslCertificateFileLocation + 2 + + + aUS-Id-i02 + + + + value: sslCACertFileLocationEnabled + + + + + + value: sslCACertFileLocationEnabled + value + sslCACertFileLocationEnabled + + + + + + + 2 + + + SW6-dc-cub + + + + toolTip: sslCACertFileLocation + + + + + + toolTip: sslCACertFileLocation + toolTip + sslCACertFileLocation + 2 + + + s1j-iY-B0W + + + + value: sslCACertFileLocation + + + + + + value: sslCACertFileLocation + value + sslCACertFileLocation + + NSNullPlaceholder + none set + + 2 + + + bez-TY-JVB + + + + hidden: useSSL + + + + + + hidden: useSSL + hidden + useSSL + + + + + + NSNegateBoolean + + 2 + + + 6oe-5y-dVM + + + + value: useSSL + + + + + + value: useSSL + value + useSSL + + + + + + + 2 + + + WuC-tH-Z8g + + + + value: sslCertificateFileLocationEnabled + + + + + + value: sslCertificateFileLocationEnabled + value + sslCertificateFileLocationEnabled + + + + + + + 2 + + + Ccl-JC-0KZ + + + + toolTip: sslKeyFileLocation + + + + + + toolTip: sslKeyFileLocation + toolTip + sslKeyFileLocation + 2 + + + 1dY-ya-XZT + + + + value: sslKeyFileLocation + + + + + + value: sslKeyFileLocation + value + sslKeyFileLocation + + NSNullPlaceholder + none set + + 2 + + + HxQ-8U-qCi + + + + value: sslKeyFileLocationEnabled + + + + + + value: sslKeyFileLocationEnabled + value + sslKeyFileLocationEnabled + + + + + + + 2 + + + AQO-79-Qoa + + + + + + 0 + + + + + + -1 + + + First Responder + + + -2 + + + File's Owner -3 @@ -5521,45 +6210,6 @@ - - 4980 - - - - - - - - - - 5422 - - - - - 5423 - - - - - - - - 4829 - - - - - - - - 5157 - - - - - - 5862 @@ -5571,13 +6221,18 @@ - 5869 - + 5863 + - + + + 5864 + + + 5865 @@ -5586,59 +6241,77 @@ - - 5863 - - - - - - - - 5864 - - - 5866 + + 5869 + + + + + + 5870 + + 5157 + + + + + + 5158 + + 4829 + + + + + + 4839 + + 5423 + + + + + + 5424 - 4985 - - - - - + 5422 + + - 4982 - + 4980 + - + + + - + 4981 @@ -5657,27 +6330,6 @@ - - 5156 - - - - - - - - - - - - - - - - - - - 5595 @@ -5695,52 +6347,30 @@ - 5614 - - - - - - - - 5613 - - - - - - - - 5606 - + 5596 + - + - 5605 - - - - - + 5597 + + - 5598 - + 5612 + - + - 5600 - - - - - + 5617 + + 5604 @@ -5751,134 +6381,160 @@ - 5612 - - - - - + 5609 + + - 5596 - + 5600 + - + - - 5597 - - - - - 5617 - - - - - 5609 - - - 5601 + + 5598 + + + + + + 5599 + + 5605 + + + + + + 5608 + + 5606 + + + + + + 5607 + + 5613 + + + + + + 5616 + + 5614 + + + + + + 5615 - 5376 - + 5156 + - + + + + + + + + + + + + + + - + - 5377 - + 5593 + - + - 5894 - - + 5594 + + - 5188 - + 5171 + - + - 5187 - - - - - + 5172 + + - 5184 - + 5173 + - + - 5183 - - - - - + 5174 + + - 5180 - + 5175 + - + - 5179 - - - - - + 5178 + + 5176 @@ -5889,102 +6545,127 @@ - 5175 - - - - - + 5177 + + - 5173 - + 5179 + - + - 5171 - - - - - + 5182 + + - 5593 - + 5180 + - + - - 5594 - - - - - 5172 - - - - - 5174 - - - - - 5178 - - - - - 5177 - - - - - 5182 - - - 5181 + + 5183 + + + + + + 5186 + + 5184 + + + + + + 5185 + + 5187 + + + + + + 5190 + + 5188 + + + + + + 5189 + + 5894 + + + + + 5377 + + + + + + 5378 + + 5376 + + + + + + 5379 + + 4982 + + + + + + 4983 @@ -5994,25 +6675,6 @@ - - 5162 - - - - - - - - - - - - - - - - - 5688 @@ -6030,52 +6692,30 @@ - 5691 - - - - - - - - 5694 - - - - - - - - 5695 - + 5697 + - + - 5689 - - - - - + 5698 + + - 5690 - + 5696 + - + - 5692 - - - - - + 5699 + + 5693 @@ -6086,126 +6726,145 @@ - 5696 - - - - - + 5702 + + - 5697 - + 5692 + - + - - 5698 - - - - - 5699 - - - - - 5702 - - - 5703 + + 5690 + + + + + + 5705 + + 5689 + + + + + + 5706 + + 5695 + + + + + + 5700 + + 5694 + + + + + + 5701 + + 5691 + + + + + + 5704 - 5385 - + 5162 + - + + + + + + + + + + + + - + - 5386 - + 5720 + - + - 5896 - - - - - 5219 - - - - - + 5721 + + - 5218 - + 5212 + - + - 5217 - - - - - + 5227 + + - 5216 - + 5213 + - + - 5215 - - - - - + 5226 + + 5214 @@ -6216,88 +6875,119 @@ - 5213 - - - - - - - - 5212 - - - - - + 5225 + + - 5720 - + 5215 + - + - - 5721 - - - - - 5227 - - - - - 5226 - - - - - 5225 - - - 5224 + + 5216 + + + + + + 5223 + + 5217 + + + + + + 5222 + + 5218 + + + + + + 5221 + + 5219 + + + + + + 5220 + + 5896 + + + + + 5386 + + + + + + 5387 + + 5385 + + + + + + 5388 + + 4985 + + + + + + 4986 + @@ -6330,102 +7020,153 @@ + - 5403 - + 5525 + - + - 5404 - + 5526 + + + + + 5523 + - + - 5898 - - + 5524 + + - 5492 - + 5264 + - + - 5291 - + 5283 + + + + + 5265 + - + - 5290 - + 5282 + + + + + 5266 + - + - 5289 - + 5281 + + + + + 5267 + - + - 5288 - + 5280 + + + + + 5268 + - + - 5287 - + 5279 + + + + + 5269 + - + - 5286 - + 5278 + + + + + 5270 + - + - 5285 - + 5277 + + + + + 5271 + - + - 5284 - + 5276 + + + + + 5272 + - + + + 5275 + + + 5273 @@ -6435,207 +7176,303 @@ - 5272 - + 5274 + + + + + 5284 + - + - 5271 - + 5299 + + + + + 5285 + - + - 5270 - + 5298 + + + + + 5286 + - + - 5269 - + 5297 + + + + + 5287 + - + - 5268 - + 5296 + + + + + 5288 + - + - 5267 - + 5295 + + + + + 5289 + - + - 5266 - + 5294 + + + + + 5290 + - + + + + + + 5293 + + + + + 5291 + + + - 5265 - + 5292 + + + + + 5492 + - + - 5264 - - - - + 5493 + + + + + 5898 + - 5523 - + 5404 + - + - 5525 - + 5405 + + + + + 5403 + - + - 5526 - - - - - 5524 - - + 5406 + + - 5283 - - + 9t3-JG-c1l + + + + + + + + + + + + + - 5282 - - + hLW-S6-RZ9 + + + + + - 5281 - - + Mkf-Q4-7vt + + + + + - 5280 - - + 3Y2-Rj-0be + + + + + - 5279 - - + zor-qs-az3 + + + + + - 5278 - - + 7nJ-pZ-buy + + + + + - 5277 - - + XLC-w6-o5W + + + + + - 5276 - - + vPP-gd-c4a + + + + + - 5275 - - + VqZ-mo-IXW + + + + + - 5274 - - + 7eD-3o-HAJ + + + + + - 5299 - - + XZJ-kZ-hgG + + - 5298 - - + dlS-N8-67W + + - 5297 - - + OCU-fz-H9W + + - 5296 - - + QTm-ne-rcS + + - 5295 - - + 30l-FF-qhV + + - 5294 - - + m4Z-qz-MVB + + - 5293 - - + ldB-Kc-oTh + + - 5292 - - + xGU-pV-iYc + + - 5493 - - + wO6-xE-Gjg + + - 5405 - - + FtV-HG-DIU + + + + + - 5406 - - + w3N-9r-DzN + + @@ -6643,6 +7480,8 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -7129,13 +7968,615 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Choose a custom SSH key file to use with this connection. Standard locations like ~/.ssh are checked automatically. + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Choose a custom SSH key file to use with this connection. Standard locations like ~/.ssh are checked automatically. + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Choose a custom SSH key file to use with this connection. Standard locations like ~/.ssh are checked automatically. + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin - + + + + ImageAndTextCell + NSTextFieldCell + + IBProjectSource + ./Classes/ImageAndTextCell.h + + + + NSTextView + + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + + + + doDecomposedStringWithCanonicalMapping: + id + + + doDecomposedStringWithCompatibilityMapping: + id + + + doPrecomposedStringWithCanonicalMapping: + id + + + doPrecomposedStringWithCompatibilityMapping: + id + + + doRemoveDiacritics: + id + + + doSelectionLowerCase: + id + + + doSelectionTitleCase: + id + + + doSelectionUpperCase: + id + + + doTranspose: + id + + + executeBundleItemForInputField: + id + + + insertNULLvalue: + id + + + moveSelectionLineDown: + id + + + moveSelectionLineUp: + id + + + orderFrontSharingServicePicker: + id + + + selectCurrentLine: + id + + + selectCurrentWord: + id + + + selectEnclosingBrackets: + id + + + toggleQuickLookPreviewPanel: + id + + + + IBProjectSource + ./Classes/NSTextView.h + + + + SPColorSelectorView + NSView + + delegate + id + + + delegate + + delegate + id + + + + IBProjectSource + ./Classes/SPColorSelectorView.h + + + + SPConnectionController + NSViewController + + id + id + id + id + id + id + id + id + id + id + id + id + id + NSMenuItem + id + id + id + id + id + + + + addFavorite: + id + + + addFavoriteUsingCurrentDetails: + id + + + addGroup: + id + + + cancelConnection: + id + + + chooseKeyLocation: + id + + + duplicateFavorite: + id + + + exportFavorites: + id + + + importFavorites: + id + + + initiateConnection: + id + + + makeSelectedFavoriteDefault: + id + + + nodeDoubleClicked: + id + + + removeNode: + id + + + renameNode: + id + + + reverseSortFavorites: + NSMenuItem + + + saveFavorite: + id + + + showHelp: + id + + + sortFavorites: + id + + + updateKeyLocationFileVisibility: + id + + + updateSSLInterface: + id + + + + NSButton + NSScrollView + NSTextField + NSView + SPSplitView + NSView + NSView + NSTextView + NSWindow + NSView + SPFavoritesOutlineView + NSMenuItem + NSButton + NSProgressIndicator + NSTextField + NSButton + SPColorSelectorView + NSView + NSView + NSTextField + NSSecureTextField + NSButton + NSButton + NSButton + NSTextField + SPColorSelectorView + NSView + NSView + NSView + NSTextField + NSSecureTextField + NSTextField + NSButton + NSSecureTextField + NSTextField + NSView + NSView + NSView + NSButton + NSButton + NSButton + SPColorSelectorView + NSView + NSView + NSTextField + NSSecureTextField + NSTextField + NSButton + NSButton + NSButton + NSTextField + NSButton + + + + connectButton + NSButton + + + connectionDetailsScrollView + NSScrollView + + + connectionInstructionsTextField + NSTextField + + + connectionResizeContainer + NSView + + + connectionSplitView + SPSplitView + + + connectionView + NSView + + + editButtonsView + NSView + + + errorDetailText + NSTextView + + + errorDetailWindow + NSWindow + + + exportPanelAccessoryView + NSView + + + favoritesOutlineView + SPFavoritesOutlineView + + + favoritesSortByMenuItem + NSMenuItem + + + helpButton + NSButton + + + progressIndicator + NSProgressIndicator + + + progressIndicatorText + NSTextField + + + saveFavoriteButton + NSButton + + + socketColorField + SPColorSelectorView + + + socketConnectionFormContainer + NSView + + + socketConnectionSSLDetailsContainer + NSView + + + socketNameField + NSTextField + + + socketPasswordField + NSSecureTextField + + + socketSSLCACertButton + NSButton + + + socketSSLCertificateButton + NSButton + + + socketSSLKeyFileButton + NSButton + + + socketUserField + NSTextField + + + sshColorField + SPColorSelectorView + + + sshConnectionFormContainer + NSView + + + sshConnectionSSLDetailsContainer + NSView + + + sshKeyLocationHelp + NSView + + + sshNameField + NSTextField + + + sshPasswordField + NSSecureTextField + + + sshSQLHostField + NSTextField + + + sshSSHKeyButton + NSButton + + + sshSSHPasswordField + NSSecureTextField + + + sshUserField + NSTextField + + + sslCACertLocationHelp + NSView + + + sslCertificateLocationHelp + NSView + + + sslKeyFileLocationHelp + NSView + + + sslOverSSHCACertButton + NSButton + + + sslOverSSHCertificateButton + NSButton + + + sslOverSSHKeyFileButton + NSButton + + + standardColorField + SPColorSelectorView + + + standardConnectionFormContainer + NSView + + + standardConnectionSSLDetailsContainer + NSView + + + standardNameField + NSTextField + + + standardPasswordField + NSSecureTextField + + + standardSQLHostField + NSTextField + + + standardSSLCACertButton + NSButton + + + standardSSLCertificateButton + NSButton + + + standardSSLKeyFileButton + NSButton + + + standardUserField + NSTextField + + + testConnectButton + NSButton + + + + IBProjectSource + ./Classes/SPConnectionController.h + + + + SPFavoriteTextFieldCell + ImageAndTextCell + + IBProjectSource + ./Classes/SPFavoriteTextFieldCell.h + + + + SPFavoritesOutlineView + NSOutlineView + + IBProjectSource + ./Classes/SPFavoritesOutlineView.h + + + + SPFlippedView + NSView + + IBProjectSource + ./Classes/SPFlippedView.h + + + + SPSplitView + NSSplitView + + toggleCollapse: + id + + + toggleCollapse: + + toggleCollapse: + id + + + + NSView + NSButton + + + + additionalDragHandleView + NSView + + + collapseToggleButton + NSButton + + + + IBProjectSource + ./Classes/SPSplitView.h + + + + 0 IBCocoaFramework YES diff --git a/Source/SPConnectionController.h b/Source/SPConnectionController.h index 19c7eee3..6c52d4b0 100644 --- a/Source/SPConnectionController.h +++ b/Source/SPConnectionController.h @@ -120,6 +120,7 @@ IBOutlet NSView *socketConnectionFormContainer; IBOutlet NSView *socketConnectionSSLDetailsContainer; IBOutlet NSView *sshConnectionFormContainer; + IBOutlet NSView *sshConnectionSSLDetailsContainer; IBOutlet NSView *sshKeyLocationHelp; IBOutlet NSView *sslKeyFileLocationHelp; IBOutlet NSView *sslCertificateLocationHelp; @@ -147,6 +148,9 @@ IBOutlet NSButton *socketSSLKeyFileButton; IBOutlet NSButton *socketSSLCertificateButton; IBOutlet NSButton *socketSSLCACertButton; + IBOutlet NSButton *sslOverSSHKeyFileButton; + IBOutlet NSButton *sslOverSSHCertificateButton; + IBOutlet NSButton *sslOverSSHCACertButton; IBOutlet NSButton *connectButton; IBOutlet NSButton *testConnectButton; diff --git a/Source/SPConnectionController.m b/Source/SPConnectionController.m index ea34ad16..adccee65 100644 --- a/Source/SPConnectionController.m +++ b/Source/SPConnectionController.m @@ -399,7 +399,7 @@ static NSComparisonResult _compareFavoritesUsingKey(id favorite1, id favorite2, [keySelectionPanel setAccessoryView:sshKeyLocationHelp]; } // SSL key file location: - else if (sender == standardSSLKeyFileButton || sender == socketSSLKeyFileButton) { + else if (sender == standardSSLKeyFileButton || sender == socketSSLKeyFileButton || sender == sslOverSSHKeyFileButton) { if ([sender state] == NSOffState) { [self setSslKeyFileLocation:nil]; return; @@ -408,7 +408,7 @@ static NSComparisonResult _compareFavoritesUsingKey(id favorite1, id favorite2, [keySelectionPanel setAccessoryView:sslKeyFileLocationHelp]; } // SSL certificate file location: - else if (sender == standardSSLCertificateButton || sender == socketSSLCertificateButton) { + else if (sender == standardSSLCertificateButton || sender == socketSSLCertificateButton || sender == sslOverSSHCertificateButton) { if ([sender state] == NSOffState) { [self setSslCertificateFileLocation:nil]; return; @@ -417,7 +417,7 @@ static NSComparisonResult _compareFavoritesUsingKey(id favorite1, id favorite2, [keySelectionPanel setAccessoryView:sslCertificateLocationHelp]; } // SSL CA certificate file location: - else if (sender == standardSSLCACertButton || sender == socketSSLCACertButton) { + else if (sender == standardSSLCACertButton || sender == socketSSLCACertButton || sender == sslOverSSHCACertButton) { if ([sender state] == NSOffState) { [self setSslCACertFileLocation:nil]; return; @@ -440,7 +440,7 @@ static NSComparisonResult _compareFavoritesUsingKey(id favorite1, id favorite2, [self setSshKeyLocation:abbreviatedFileName]; } // SSL key file selection - else if (sender == standardSSLKeyFileButton || sender == socketSSLKeyFileButton) { + else if (sender == standardSSLKeyFileButton || sender == socketSSLKeyFileButton || sender == sslOverSSHKeyFileButton) { if (returnCode == NSCancelButton) { [self setSslKeyFileLocationEnabled:NSOffState]; [self setSslKeyFileLocation:nil]; @@ -450,7 +450,7 @@ static NSComparisonResult _compareFavoritesUsingKey(id favorite1, id favorite2, [self setSslKeyFileLocation:abbreviatedFileName]; } // SSL certificate file selection - else if (sender == standardSSLCertificateButton || sender == socketSSLCertificateButton) { + else if (sender == standardSSLCertificateButton || sender == socketSSLCertificateButton || sender == sslOverSSHCertificateButton) { if (returnCode == NSCancelButton) { [self setSslCertificateFileLocationEnabled:NSOffState]; [self setSslCertificateFileLocation:nil]; @@ -460,7 +460,7 @@ static NSComparisonResult _compareFavoritesUsingKey(id favorite1, id favorite2, [self setSslCertificateFileLocation:abbreviatedFileName]; } // SSL CA certificate file selection - else if (sender == standardSSLCACertButton || sender == socketSSLCACertButton) { + else if (sender == standardSSLCACertButton || sender == socketSSLCACertButton || sender == sslOverSSHCACertButton) { if (returnCode == NSCancelButton) { [self setSslCACertFileLocationEnabled:NSOffState]; [self setSslCACertFileLocation:nil]; @@ -546,6 +546,7 @@ static NSComparisonResult _compareFavoritesUsingKey(id favorite1, id favorite2, break; case SPSSHTunnelConnection: targetResizeRect = [sshConnectionFormContainer frame]; + if ([self useSSL]) additionalFormHeight += [sshConnectionSSLDetailsContainer frame].size.height; break; } -- cgit v1.2.3