diff options
| author | rowanbeentje <rowan@beent.je> | 2009-05-28 01:14:26 +0000 |
|---|---|---|
| committer | rowanbeentje <rowan@beent.je> | 2009-05-28 01:14:26 +0000 |
| commit | 1979b7c94813e8278b4b7616aeafecd5a406f7a1 (patch) | |
| tree | 108669de904ec9ee85806e5f91ec17b23cda1f7e /Source/TableDocument.h | |
| parent | a316ba498cf3300d05c8c2ba3223fa2c625d1717 (diff) | |
| download | sequelpro-1979b7c94813e8278b4b7616aeafecd5a406f7a1.tar.gz sequelpro-1979b7c94813e8278b4b7616aeafecd5a406f7a1.tar.bz2 sequelpro-1979b7c94813e8278b4b7616aeafecd5a406f7a1.zip | |
Add support for SSH tunnels, improve password security, and tweaks:
- Implementation of a new SPSSHTunnel class, designed to closely integrate SSH tunnels within Sequel Pro.
- Integration of SPSSHTunnel - new connection methods using callbacks, and CMMCPConnection integration
- Keychain class upgrade to include the new SPSSHTunnel keychain password helper on the trusted access list for new passwords
- Keychain passwords are now held in memory/UI for only as long as necessary, increasing password security
- Updated interface to enable/add SSH tunnel functionality
- Remove old SSHTunnel class
- Addition of new target for the SSH Tunnel password assistant, addition as a dependency of the main target, and addition to build script to copy into resources directory
- Fix a keychain password deletion crash
Diffstat (limited to 'Source/TableDocument.h')
| -rw-r--r-- | Source/TableDocument.h | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/Source/TableDocument.h b/Source/TableDocument.h index 738acdfb..e71e80ac 100644 --- a/Source/TableDocument.h +++ b/Source/TableDocument.h @@ -28,6 +28,7 @@ #import <Cocoa/Cocoa.h> #import <MCPKit_bundled/MCPKit_bundled.h> #import <WebKit/WebKit.h> +#import "SPSSHTunnel.h" @class CMMCPConnection, CMMCPResult; @@ -65,8 +66,13 @@ IBOutlet id passwordField; IBOutlet id portField; IBOutlet id databaseField; + IBOutlet id sshCheckbox; + IBOutlet id sshHostField; + IBOutlet id sshUserField; + IBOutlet id sshPasswordField; + IBOutlet id sshPortField; - IBOutlet id connectProgressBar; + IBOutlet NSProgressIndicator *connectProgressBar; IBOutlet NSTextField *connectProgressStatusText; IBOutlet id databaseNameField; IBOutlet id databaseEncodingButton; @@ -92,6 +98,11 @@ NSString *mySQLVersion; NSUserDefaults *prefs; + NSString *connectionKeychainItemName; + NSString *connectionKeychainItemAccount; + NSString *connectionSSHKeychainItemName; + NSString *connectionSSHKeychainItemAccount; + NSMenu *selectEncodingMenu; BOOL _supportsEncoding; NSString *_encoding; @@ -107,13 +118,17 @@ //start sheet - (void)setShouldAutomaticallyConnect:(BOOL)shouldAutomaticallyConnect; - (IBAction)connectToDB:(id)sender; -- (IBAction)connect:(id)sender; +- (IBAction)initiateConnection:(id)sender; +- (void)initiateSSHTunnelConnection; +- (void)sshTunnelCallback:(SPSSHTunnel *)theTunnel; +- (void)initiateMySQLConnection:(SPSSHTunnel *)theTunnel; +- (void)failConnectionWithErrorMessage:(NSString *)theErrorMessage; - (IBAction)cancelConnectSheet:(id)sender; - (IBAction)closeSheet:(id)sender; - (IBAction)chooseFavorite:(id)sender; +- (IBAction)toggleUseSSH:(id)sender; - (IBAction)editFavorites:(id)sender; - (id)selectedFavorite; -- (NSString *)selectedFavoritePassword; - (void)connectSheetAddToFavorites:(id)sender; - (void)addToFavoritesName:(NSString *)name host:(NSString *)host socket:(NSString *)socket user:(NSString *)user password:(NSString *)password |