aboutsummaryrefslogtreecommitdiffstats
path: root/Source/SPSSHTunnel.h
diff options
context:
space:
mode:
authorrowanbeentje <rowan@beent.je>2009-06-04 01:44:16 +0000
committerrowanbeentje <rowan@beent.je>2009-06-04 01:44:16 +0000
commit31123c9ff149908120a5bca94e76f5023c0b7e1e (patch)
treef76933e4c19d63cd17f160919731fbb5c9162b75 /Source/SPSSHTunnel.h
parentfc748400d92a0b7874a19eba3fa573cdf1415ee5 (diff)
downloadsequelpro-31123c9ff149908120a5bca94e76f5023c0b7e1e.tar.gz
sequelpro-31123c9ff149908120a5bca94e76f5023c0b7e1e.tar.bz2
sequelpro-31123c9ff149908120a5bca94e76f5023c0b7e1e.zip
Further SSH tunnel improvements, password handling improvements, and minor bugfixes:
- SSH tunnels can now correctly show dialogs for ssh queries, eg host key mismatches - SSH tunnels are now correctly closed by the document for connection failures - Keychain password item name and account generation has been moved to within the keychain class, to centralise generation for consistency - Keychain item names and accounts now correctly deal with nil values, allowing more keychain items to be read - "Add to favorites" button and menu item now correctly store passwords and SSH tunnel settings - Duplicating favorites in preferences now selects the newly created favorite instead of deselecting everything - Fixes an occasional crasher sometimes encountered in keychain usage
Diffstat (limited to 'Source/SPSSHTunnel.h')
-rw-r--r--Source/SPSSHTunnel.h17
1 files changed, 12 insertions, 5 deletions
diff --git a/Source/SPSSHTunnel.h b/Source/SPSSHTunnel.h
index 91bd08de..612ef595 100644
--- a/Source/SPSSHTunnel.h
+++ b/Source/SPSSHTunnel.h
@@ -17,14 +17,18 @@ enum spsshtunnel_password_modes
@interface SPSSHTunnel : NSObject
{
+ IBOutlet NSWindow *sshQuestionDialog;
+ IBOutlet NSTextField *sshQuestionText;
+
+ NSWindow *parentWindow;
NSTask *task;
NSPipe *standardError;
id delegate;
SEL stateChangeSelector;
- NSConnection *passwordConnection;
+ NSConnection *tunnelConnection;
NSString *lastError;
- NSString *passwordConnectionName;
- NSString *passwordConnectionVerifyHash;
+ NSString *tunnelConnectionName;
+ NSString *tunnelConnectionVerifyHash;
NSString *sshHost;
NSString *sshLogin;
NSString *remoteHost;
@@ -40,15 +44,18 @@ enum spsshtunnel_password_modes
- (id) initToHost:(NSString *) theHost port:(int) thePort login:(NSString *) theLogin tunnellingToPort:(int) targetPort onHost:(NSString *) targetHost;
- (BOOL) setConnectionStateChangeSelector:(SEL)theStateChangeSelector delegate:(id)theDelegate;
-- (BOOL) setPassword:(NSString *)thePassword;
+- (void) setParentWindow:(NSWindow *)theWindow;
- (BOOL) setPasswordKeychainName:(NSString *)theName account:(NSString *)theAccount;
+- (BOOL) setPassword:(NSString *)thePassword;
- (int) state;
- (NSString *) lastError;
- (int) localPort;
- (void) connect;
- (void) launchTask:(id) dummy;
-- (void)disconnect;
+- (void) disconnect;
- (void) standardErrorHandler:(NSNotification*)aNotification;
- (NSString *) getPasswordWithVerificationHash:(NSString *)theHash;
+- (BOOL) getResponseForQuestion:(NSString *)theQuestion;
+- (IBAction) closeSheet:(id)sender;
@end