[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
mjs
mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:45:09 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 6b8c434c64ca76ad151182b1344a51700d5d7ce6
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Sep 27 11:30:48 2002 +0000
WebFoundation:
Put in place all the API changes needed for the "remember
password" feature and examining stored passwords. The actual
storing of passwords in Keychain is not implemented yet - that's
the next step.
* AuthenticationManager.subproj/WebAuthenticatingResource.h: Added.
* AuthenticationManager.subproj/WebAuthenticatingResource.m: Added. New class that's
the data holder part of WebAuthenticationRequest, the part that describes the resource
needing authentication.
(-[WebAuthenticatingResourcePrivate dealloc]):
(-[WebAuthenticatingResource initWithURL:realm:username:receivesCredentialSecurely:proxyHost:proxyType:]):
(+[WebAuthenticatingResource resourceWithURL:realm:username:receivesCredentialSecurely:proxyHost:proxyType:]):
(-[WebAuthenticatingResource init]):
(-[WebAuthenticatingResource dealloc]):
(-[WebAuthenticatingResource URL]):
(-[WebAuthenticatingResource realm]):
(-[WebAuthenticatingResource username]):
(-[WebAuthenticatingResource receivesCredentialSecurely]):
(-[WebAuthenticatingResource isProxy]):
(-[WebAuthenticatingResource proxyHost]):
(-[WebAuthenticatingResource proxyType]):
(-[WebAuthenticatingResource copyWithZone:]):
* AuthenticationManager.subproj/WebAuthenticationHandler.h:
* AuthenticationManager.subproj/WebAuthenticationHandlerDispatcher.m:
(-[WebAuthenticationDispatchState dealloc]):
(-[WebAuthenticationHandlerDispatcher _dispatchStartAuthentication:]):
(-[WebAuthenticationHandlerDispatcher WebAuthenticationRequest:useCredential:]):
(-[WebAuthenticationHandlerDispatcher _dispatchAuthenticationDone:]):
(-[WebAuthenticationHandlerDispatcher startAuthentication:]):
* AuthenticationManager.subproj/WebAuthenticationManager.h:
* AuthenticationManager.subproj/WebAuthenticationManager.m:
(-[WebAuthenticationManager removeCredentialForResource:]):
(-[WebAuthenticationManager resourceCredentials]):
(-[WebAuthenticationManager _invokeHandlersWithURL:realm:forRequest:withCallback:context:]):
(-[WebAuthenticationManager _invokeHandlersWithURL:proxy:forRequest:withCallback:context:]):
(-[WebAuthenticationManager _tryRequest:]):
(-[WebAuthenticationManager WebAuthenticationRequest:useCredential:]):
* AuthenticationManager.subproj/WebAuthenticationRequest.h:
* AuthenticationManager.subproj/WebAuthenticationRequest.m:
(-[WebAuthenticationRequestPrivate initWithResource:previousFailureCount:delegate:]):
(-[WebAuthenticationRequestPrivate dealloc]):
(-[WebAuthenticationRequest
_initWithResource:previousFailureCount:delegate:]): Change to init
with a WebAuthenticatingResource rather than passing all the data.
(-[WebAuthenticationRequest _authenticationHandlerBusy]):
(-[WebAuthenticationRequest resource]): New method
(-[WebAuthenticationRequest previousFailureCount]): Renamed from previousFailures
(-[WebAuthenticationRequest useCredential:]): Renamed from authenticationDone:
(-[WebAuthenticationRequest cancel]): Removed to fix in-band signalling
* AuthenticationManager.subproj/WebAuthenticationRequestPrivate.h:
* AuthenticationManager.subproj/WebAuthenticationResult.m: Removed.
* AuthenticationManager.subproj/WebCredential.h: Added.
* AuthenticationManager.subproj/WebCredential.m: Added. Renamed from
WebAuthenticationResult.
(-[WebCredentialPrivate dealloc]):
(-[WebCredential initWithUsername:password:remembered:]): Add remembered: parameter
(+[WebCredential credentialWithUsername:password:remembered:]): Likewise
(-[WebCredential dealloc]):
(-[WebCredential username]):
(-[WebCredential password]):
(-[WebCredential remembered]): New method
(-[WebCredential copyWithZone:]):
* Misc.subproj/WebFoundation.h:
* WebFoundation.exp: Fix exports.
* WebFoundation.pbproj/project.pbxproj: Add new files, remove removed ones.
Mechanical fixes to get C glue to compile:
* AuthenticationManager.subproj/IFAuthenticationHandlerC.m:
(-[IFCallBackAuthenticationHandler isReadyToStartAuthentication:]):
* AuthenticationManager.subproj/IFAuthenticationRequestC.m:
(IFAuthenticationRequestCopyURL):
(IFAuthenticationRequestCopyRealm):
(IFAuthenticationRequestCopyUsername):
(IFAuthenticationRequestWillPasswordBeSentInClear):
(IFAuthenticationRequestGetPreviousFailures):
(IFAuthenticationRequestIsForProxy):
(IFAuthenticationRequestCopyProxyHost):
(IFAuthenticationRequestCopyProxyType):
(IFAuthenticationRequestDone):
* AuthenticationManager.subproj/IFAuthenticationResultC.m:
(IFAuthenticationResultCreate):
(IFAuthenticationResultCopyUsername):
(IFAuthenticationResultCopyPassword):
WebKit:
* Panels.subproj/WebAuthenticationPanel.m:
(-[WebAuthenticationPanel setUpForRequest:]):
(-[WebAuthenticationPanel runAsModalDialogWithRequest:]):
(-[WebAuthenticationPanel sheetDidEnd:returnCode:contextInfo:]):
* Panels.subproj/WebPanelAuthenticationHandler.h:
* Panels.subproj/WebPanelAuthenticationHandler.m:
(-[WebPanelAuthenticationHandler isReadyToStartAuthentication:]):
(-[WebPanelAuthenticationHandler startAuthentication:]):
(-[WebPanelAuthenticationHandler _authenticationDoneWithRequest:result:]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2182 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 64730b9..a1eac13 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2002-09-27 Maciej Stachowiak <mjs at apple.com>
+
+ * Panels.subproj/WebAuthenticationPanel.m:
+ (-[WebAuthenticationPanel setUpForRequest:]):
+ (-[WebAuthenticationPanel runAsModalDialogWithRequest:]):
+ (-[WebAuthenticationPanel sheetDidEnd:returnCode:contextInfo:]):
+ * Panels.subproj/WebPanelAuthenticationHandler.h:
+ * Panels.subproj/WebPanelAuthenticationHandler.m:
+ (-[WebPanelAuthenticationHandler isReadyToStartAuthentication:]):
+ (-[WebPanelAuthenticationHandler startAuthentication:]):
+ (-[WebPanelAuthenticationHandler _authenticationDoneWithRequest:result:]):
+
2002-09-26 Darin Adler <darin at apple.com>
* WebCoreSupport.subproj/WebBridge.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 64730b9..a1eac13 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,15 @@
+2002-09-27 Maciej Stachowiak <mjs at apple.com>
+
+ * Panels.subproj/WebAuthenticationPanel.m:
+ (-[WebAuthenticationPanel setUpForRequest:]):
+ (-[WebAuthenticationPanel runAsModalDialogWithRequest:]):
+ (-[WebAuthenticationPanel sheetDidEnd:returnCode:contextInfo:]):
+ * Panels.subproj/WebPanelAuthenticationHandler.h:
+ * Panels.subproj/WebPanelAuthenticationHandler.m:
+ (-[WebPanelAuthenticationHandler isReadyToStartAuthentication:]):
+ (-[WebPanelAuthenticationHandler startAuthentication:]):
+ (-[WebPanelAuthenticationHandler _authenticationDoneWithRequest:result:]):
+
2002-09-26 Darin Adler <darin at apple.com>
* WebCoreSupport.subproj/WebBridge.m:
diff --git a/WebKit/Panels.subproj/WebAuthenticationPanel.m b/WebKit/Panels.subproj/WebAuthenticationPanel.m
index 607f3b4..ee72ea3 100644
--- a/WebKit/Panels.subproj/WebAuthenticationPanel.m
+++ b/WebKit/Panels.subproj/WebAuthenticationPanel.m
@@ -78,19 +78,21 @@
{
[self loadNib];
+ WebAuthenticatingResource *resource = [req resource];
+
// FIXME Radar 2876448: we should display a different dialog depending on the
// failure count (if the user tried and failed, the dialog should
// explain possible reasons)
// FIXME Radar 2876446: need to automatically adjust height of main label
- [mainLabel setStringValue:[NSString stringWithFormat:@"To view this page, you need to log in to area \"%@\" on %@.", [req realm], [[req URL] host]]];
- if ([req willPasswordBeSentInClear]) {
- [smallLabel setStringValue:@"Your password will be sent in the clear."];
- } else {
+ [mainLabel setStringValue:[NSString stringWithFormat:@"To view this page, you need to log in to area \"%@\" on %@.", [resource realm], [[resource URL] host]]];
+ if ([resource receivesCredentialSecurely]) {
[smallLabel setStringValue:@"Your log-in information will be sent securely."];
+ } else {
+ [smallLabel setStringValue:@"Your password will be sent in the clear."];
}
- if ([req username] != nil) {
- [username setStringValue:[req username]];
+ if ([resource username] != nil) {
+ [username setStringValue:[resource username]];
[panel setInitialFirstResponder:password];
} else {
[username setStringValue:@""];
@@ -103,13 +105,13 @@
{
[self setUpForRequest:req];
usingSheet = FALSE;
- WebAuthenticationResult *result = nil;
+ WebCredential *credential = nil;
if ([[NSApplication sharedApplication] runModalForWindow:panel] == 0) {
- result = [WebAuthenticationResult authenticationResultWithUsername:[username stringValue] password:[password stringValue]];
+ credential = [WebCredential credentialWithUsername:[username stringValue] password:[password stringValue] remembered:NO];
}
- [callback performSelector:selector withObject:req withObject:result];
+ [callback performSelector:selector withObject:req withObject:credential];
}
- (void)runAsSheetOnWindow:(NSWindow *)window withRequest:(WebAuthenticationRequest *)req
@@ -126,21 +128,21 @@
- (void)sheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo
{
- WebAuthenticationResult *result = nil;
+ WebCredential *credential = nil;
WebAuthenticationRequest *req;
ASSERT(usingSheet);
ASSERT(request != nil);
if (returnCode == 0) {
- result = [WebAuthenticationResult authenticationResultWithUsername:[username stringValue] password:[password stringValue]];
+ credential = [WebCredential credentialWithUsername:[username stringValue] password:[password stringValue] remembered:NO];
}
// We take this tricky approach to nilling out and releasing the request,
// because the callback below might remove our last ref.
req = request;
request = nil;
- [callback performSelector:selector withObject:req withObject:result];
+ [callback performSelector:selector withObject:req withObject:credential];
[req release];
}
diff --git a/WebKit/Panels.subproj/WebPanelAuthenticationHandler.h b/WebKit/Panels.subproj/WebPanelAuthenticationHandler.h
index 265af4c..2ec4b1f 100644
--- a/WebKit/Panels.subproj/WebPanelAuthenticationHandler.h
+++ b/WebKit/Panels.subproj/WebPanelAuthenticationHandler.h
@@ -14,10 +14,4 @@
NSMutableDictionary *requestToWindow;
}
-// WebAuthenticationHandler methods
--(BOOL)readyToStartAuthentication:(WebAuthenticationRequest *)request;
--(void)startAuthentication:(WebAuthenticationRequest *)request;
--(void)cancelAuthentication:(WebAuthenticationRequest *)request;
-
-
@end
diff --git a/WebKit/Panels.subproj/WebPanelAuthenticationHandler.m b/WebKit/Panels.subproj/WebPanelAuthenticationHandler.m
index 7013ee9..ad89caf 100644
--- a/WebKit/Panels.subproj/WebPanelAuthenticationHandler.m
+++ b/WebKit/Panels.subproj/WebPanelAuthenticationHandler.m
@@ -32,9 +32,9 @@ static NSString *WebModalDialogPretendWindow = @"WebModalDialogPretendWindow";
}
// WebAuthenticationHandler methods
--(BOOL)readyToStartAuthentication:(WebAuthenticationRequest *)request
+-(BOOL)isReadyToStartAuthentication:(WebAuthenticationRequest *)request
{
- id window = [[WebStandardPanels sharedStandardPanels] frontmostWindowLoadingURL:[request URL]];
+ id window = [[WebStandardPanels sharedStandardPanels] frontmostWindowLoadingURL:[[request resource] URL]];
if (window == nil) {
window = WebModalDialogPretendWindow;
@@ -45,14 +45,14 @@ static NSString *WebModalDialogPretendWindow = @"WebModalDialogPretendWindow";
-(void)startAuthentication:(WebAuthenticationRequest *)request
{
- id window = [[WebStandardPanels sharedStandardPanels] frontmostWindowLoadingURL:[request URL]];
+ id window = [[WebStandardPanels sharedStandardPanels] frontmostWindowLoadingURL:[[request resource] URL]];
if (window == nil) {
window = WebModalDialogPretendWindow;
}
if ([windowToPanel objectForKey:window] != nil) {
- [request authenticationDone:nil];
+ [request cancel];
return;
}
@@ -77,7 +77,7 @@ static NSString *WebModalDialogPretendWindow = @"WebModalDialogPretendWindow";
}
}
--(void)_authenticationDoneWithRequest:(WebAuthenticationRequest *)request result:(WebAuthenticationResult *)result
+-(void)_authenticationDoneWithRequest:(WebAuthenticationRequest *)request result:(WebCredential *)credential
{
id window = [requestToWindow objectForKey:request];
if (window != nil) {
@@ -85,7 +85,7 @@ static NSString *WebModalDialogPretendWindow = @"WebModalDialogPretendWindow";
[requestToWindow removeObjectForKey:request];
}
- [request authenticationDone:result];
+ [request useCredential:credential];
}
@end
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list