mirror of
https://github.com/gnustep/libs-gsweb.git
synced 2025-02-24 04:01:16 +00:00
* GSWeb/GSWApplication.m o removed unused +initialize * GSWeb/GSWDefaultAdaptorThread.m: o more information on "bad request first line" exception * GSWeb/GSWHTMLDynamicElement.m o in -initWithName:attributeAssociations:contentElements: add "" to association values because XML parser romove them. o added -computeActionStringWithActionClassAssociation: directActionNameAssociation:inContext: o added -computeQueryDictionaryWithActionClassAssociation: directActionNameAssociation:queryDictionaryAssociation: otherQueryAssociations:inContext: * GSWeb/GSWResponse.m: o don't append debugcomment if !GSDebugSet(@"debugComments") o fixed bug in appendContentString: in NSAssert3 params o adedd -_appendTagAttribute:value:escapingHTMLAttributeValue: o added GSWResponse (GSWResponseRedirected) * GSWeb/GSWResponse.h: o added -forceFinalizeInContext o added GSWResponse (GSWResponseRedirected) * GSWeb/GSWTemplateParserXML.m: o only include comments if [GSWApplication includeCommentsInResponses] * GSWExtensions.framework/GSWLongResponsePage.m: o in -cancel call cancelPageForStatus: instead of cancelPage o declare private interface * GSWeb/GSWComponent.m: o don't output end of component commend if !DEBUG && !GSDebugSet(@"gswcomponents") o fixes in _generateResponseInContext: * GSWeb/GSWContext.[hm]: o added _userInfo to enable developper context specific temporary information storage o added -userInfo o added -_generateRelativeURLs o make -_generateCompleteURLs returning previous state. o added -directActionURLForActionNamed:queryDictionary:isSecure: o added -_directActionURLForActionNamed:queryDictionary:isSecure:url: o added -componentActionURLIsSecure: o modified -session o modified -_takeAwakeComponent: to not add already added component o implemented _takeAwakeComponentsFromArray; o fixed -_incrementContextID o added _session o fixes in -copyWithZone to keep mutable objects mutables. o added _requestContextID o added -_setRequestContextID: and -_requestContextID; * GSWeb/GSWHyperlink.[hm]: o added _secure o added binding validation tests o fixes in -appendToResponse:inContext: o handle correctly otherQueryAssociations (bindings starting with '?') * GSWeb/GSWConstants.[hm]: o added cidStore__Key for GSWHTMLURLValuedElement o added cidKey__Key for GSWHTMLURLValuedElement * GSWeb/GSWImage.[hm]: o added _width, _height * GSWeb/GSWHTMLURLValuedElement.[hm] o implemented -_appendCGIActionURLToResponse:inContext: o implemented -computeActionStringInContext: o implemented -computeQueryDictionaryInContext: o handle otherQueryAssociations (bindings starting with '?') o handle cidStore and cidKey * GSWeb/GSWRequest.[hm]: o added _context o changes for compilation warnings o added -sessionIDFromValuesOrCookieByLookingForCookieFirst: o added +_lookForIDsInCookiesFirst o rewrite form/uri/cookie values retrieving (for sessionID,...) o new use GSMimeParser for formData parsing * Doc/antlr.txt added * GSWeb/GSWPageDefParser.[hm] regenerated to handle (bindings starting with '?') * GSWeb/GSWPageDefParserTokenTypes.txt regenerated to handle (bindings starting with '?') * GSWeb/GSWPageDefParserTokenTypes.h regenerated to handle (bindings starting with '?') * GSWeb/GSWPageDefLexer.[hm] regenerated to handle (bindings starting with '?') * GSWeb/GSWUtils.[hm]: o added -extractObjectsForKeysWithPrefix:removePrefix: o fixed bug in HexStringToData o fixed bug in NSDictionary +dictionaryWithArray:onSelector:withObject: * GSWeb/GSWForm.[hm] o handle otherQueryAssociations (bindings starting with '?') o implemented -computeQueryDictionaryInContext: o implemented/fixed -_appendHiddenFieldsToResponse:inContext: o implemented -_appendCGIActionToResponse:inContext: o fix -appendGSWebObjectsAssociationsToResponse:inContext: for directAction o added -computeActionStringInContext: o fixed -invokeActionForRequest:inContext: to invoke action when to element is invoked * GSWeb/GSWDirectAction.m: o fixed -_initializeRequestSessionIDInContext: o added -sessionIDForRequest: * GSWeb/NSString+HTML.[hm]: o added -dictionaryWithSep1:withSep2:withOptionUnescape:forceArray: * GSWeb/NSString+Trimming.m: o fix in +stringUniqueIdWithLength: initialize random generator * GSWeb/GSWSession.[hm]: o added createSessionID which create better sessionID (uniq in time and larger to give better security) o fixes in _saveCurrentPage * GSWeb/GSWBundle.m: o fix compiler warning git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@15630 72102866-910b-0410-8b05-ffd578937521
377 lines
10 KiB
Objective-C
377 lines
10 KiB
Objective-C
/** GSWDirectAction.m - <title>GSWeb: Class GSWDirectAction</title>
|
|
|
|
Copyright (C) 1999-2003 Free Software Foundation, Inc.
|
|
|
|
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
|
|
Date: Feb 1999
|
|
|
|
$Revision$
|
|
$Date$
|
|
$Id$
|
|
|
|
This file is part of the GNUstep Web Library.
|
|
|
|
<license>
|
|
This library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2 of the License, or (at your option) any later version.
|
|
|
|
This library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with this library; if not, write to the Free
|
|
Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
</license>
|
|
**/
|
|
|
|
static const char rcsId[] = "$Id$";
|
|
|
|
#include <GSWeb/GSWeb.h>
|
|
|
|
//====================================================================
|
|
@implementation GSWDirectAction
|
|
|
|
//--------------------------------------------------------------------
|
|
-(id)initWithRequest:(GSWRequest*)aRequest
|
|
{
|
|
LOGObjectFnStart();
|
|
if ((self=[super init]))
|
|
{
|
|
_context=[GSWContext contextWithRequest:aRequest];
|
|
[GSWApp _setContext:_context]; //NDFN
|
|
[self _initializeRequestSessionIDInContext:_context];
|
|
};
|
|
LOGObjectFnStop();
|
|
return self;
|
|
};
|
|
|
|
//--------------------------------------------------------------------
|
|
-(void)dealloc
|
|
{
|
|
DESTROY(_context);
|
|
[super dealloc];
|
|
};
|
|
|
|
//--------------------------------------------------------------------
|
|
-(GSWRequest*)request
|
|
{
|
|
return [_context request];
|
|
};
|
|
|
|
//--------------------------------------------------------------------
|
|
-(GSWSession*)existingSession
|
|
{
|
|
//OK
|
|
GSWSession* session=nil;
|
|
BOOL hasSession=NO;
|
|
LOGObjectFnStart();
|
|
hasSession=[_context hasSession];
|
|
if (hasSession)
|
|
session=[_context existingSession];
|
|
if (!session)
|
|
{
|
|
NSString* sessionID=nil;
|
|
sessionID=[[self request] sessionID];
|
|
if (sessionID)
|
|
{
|
|
NS_DURING
|
|
{
|
|
NSDebugMLLog(@"requests",@"sessionID=%@",sessionID);
|
|
session=[GSWApp restoreSessionWithID:sessionID
|
|
inContext:_context];
|
|
//No Exception if session can't be restored !
|
|
}
|
|
NS_HANDLER
|
|
{
|
|
localException=ExceptionByAddingUserInfoObjectFrameInfo0(localException,@"in session create/restore");
|
|
LOGException(@"exception=%@",localException);
|
|
//No Exception if session can't be restored !
|
|
session=nil;
|
|
}
|
|
NS_ENDHANDLER;
|
|
};
|
|
};
|
|
LOGObjectFnStop();
|
|
return session;
|
|
};
|
|
|
|
//--------------------------------------------------------------------
|
|
-(GSWSession*)existingSessionWithSessionID:(NSString*)aSessionID
|
|
{
|
|
//OK
|
|
GSWSession* session=nil;
|
|
BOOL hasSession=NO;
|
|
LOGObjectFnStart();
|
|
hasSession=[_context hasSession];
|
|
if (hasSession)
|
|
session=[_context existingSession];
|
|
if (!session)
|
|
{
|
|
if (aSessionID)
|
|
{
|
|
NS_DURING
|
|
{
|
|
NSDebugMLLog(@"requests",@"aSessionID=%@",aSessionID);
|
|
session=[GSWApp restoreSessionWithID:aSessionID
|
|
inContext:_context];
|
|
//No Exception if session can't be restored !
|
|
}
|
|
NS_HANDLER
|
|
{
|
|
localException=ExceptionByAddingUserInfoObjectFrameInfo0(localException,@"in session create/restore");
|
|
LOGException(@"exception=%@",localException);
|
|
//No Exception if session can't be restored !
|
|
session=nil;
|
|
}
|
|
NS_ENDHANDLER;
|
|
};
|
|
};
|
|
LOGObjectFnStop();
|
|
return session;
|
|
};
|
|
|
|
//--------------------------------------------------------------------
|
|
-(GSWSession*)session
|
|
{
|
|
BOOL hasSession=NO;
|
|
GSWSession* session=nil;
|
|
LOGObjectFnStart();
|
|
hasSession=[_context hasSession];
|
|
if (hasSession)
|
|
session=[_context existingSession];
|
|
if (!session)
|
|
{
|
|
NSString* sessionID=nil;
|
|
sessionID=[[self request] sessionID];
|
|
if (sessionID)
|
|
{
|
|
NS_DURING
|
|
{
|
|
session=[GSWApp restoreSessionWithID:sessionID
|
|
inContext:_context];
|
|
}
|
|
NS_HANDLER
|
|
{
|
|
localException=ExceptionByAddingUserInfoObjectFrameInfo0(localException,@"in session create/restore");
|
|
LOGException(@"exception=%@",localException);
|
|
[localException raise];
|
|
};
|
|
NS_ENDHANDLER;
|
|
if (!session)
|
|
{
|
|
ExceptionRaise(@"GSWDirectAction",
|
|
@"Unable to restore sessionID %@.",
|
|
sessionID);
|
|
};
|
|
}
|
|
else
|
|
{
|
|
// No Session ID: Create a new Session
|
|
session=[_context session];
|
|
};
|
|
};
|
|
LOGObjectFnStop();
|
|
return session;
|
|
};
|
|
|
|
//--------------------------------------------------------------------
|
|
// application
|
|
|
|
-(GSWApplication*)application
|
|
{
|
|
return [GSWApplication application];
|
|
};
|
|
|
|
//--------------------------------------------------------------------
|
|
-(GSWComponent*)pageWithName:(NSString*)pageName
|
|
{
|
|
//OK
|
|
GSWComponent* component=nil;
|
|
LOGObjectFnStart();
|
|
NS_DURING
|
|
{
|
|
component=[[GSWApplication application]pageWithName:pageName
|
|
inContext:_context];
|
|
}
|
|
NS_HANDLER
|
|
{
|
|
LOGException(@"%@ (%@)",
|
|
localException,
|
|
[localException reason]);
|
|
localException=ExceptionByAddingUserInfoObjectFrameInfo0(localException,@"In pageWithName:inContext:");
|
|
[localException raise];
|
|
};
|
|
NS_ENDHANDLER;
|
|
LOGObjectFnStop();
|
|
return component;
|
|
};
|
|
|
|
//--------------------------------------------------------------------
|
|
-(id <GSWActionResults>)performActionNamed:(NSString*)actionName
|
|
{
|
|
//OK
|
|
id<GSWActionResults> actionResult=nil;
|
|
NSString* actionSelName=nil;
|
|
SEL actionSel=NULL;
|
|
LOGObjectFnStart();
|
|
actionSelName=[NSString stringWithFormat:@"%@Action",actionName];
|
|
NSDebugMLLog(@"requests",@"actionSelName=%@",actionSelName);
|
|
actionSel=NSSelectorFromString(actionSelName);
|
|
NSDebugMLLog(@"requests",@"actionSel=%p",(void*)actionSel);
|
|
if (actionSel)
|
|
{
|
|
NS_DURING
|
|
{
|
|
actionResult=[self performSelector:actionSel];
|
|
NSDebugMLLog(@"requests",
|
|
@"_actionResult=%@ class=%@",
|
|
actionResult,
|
|
[actionResult class]);
|
|
}
|
|
NS_HANDLER
|
|
{
|
|
LOGException(@"%@ (%@)",
|
|
localException,
|
|
[localException reason]);
|
|
localException=ExceptionByAddingUserInfoObjectFrameInfo0(localException,@"In performSelector:");
|
|
[localException raise];
|
|
};
|
|
NS_ENDHANDLER;
|
|
}
|
|
else
|
|
{
|
|
LOGError(@"No selector for: %@",actionSelName);//TODO
|
|
actionResult=[self defaultAction];//No ??
|
|
};
|
|
LOGObjectFnStop();
|
|
return actionResult;
|
|
};
|
|
|
|
//--------------------------------------------------------------------
|
|
-(id)defaultAction
|
|
{
|
|
LOGObjectFnStart();
|
|
LOGObjectFnStop();
|
|
return nil;//??
|
|
};
|
|
|
|
//--------------------------------------------------------------------
|
|
-(NSString*)sessionIDForRequest:(GSWRequest*)aRequest
|
|
{
|
|
NSString* sessionID = nil;
|
|
NSDebugMLog(@"aRequest=%@",aRequest);
|
|
if(aRequest)
|
|
sessionID = [aRequest sessionIDFromValuesOrCookieByLookingForCookieFirst:NO];
|
|
NSDebugMLog(@"sessionID=%@",sessionID);
|
|
return sessionID;
|
|
}
|
|
|
|
//--------------------------------------------------------------------
|
|
-(void)_initializeRequestSessionIDInContext:(GSWContext*)aContext
|
|
{
|
|
GSWRequest* request=nil;
|
|
NSString* sessionID=nil;
|
|
LOGObjectFnStart();
|
|
request=[aContext request];
|
|
NSDebugMLog(@"request=%@",request);
|
|
sessionID=[request formValueForKey:GSWKey_SessionID[GSWebNamingConv]];
|
|
NSDebugMLog(@"sessionID=%@",sessionID);
|
|
if (!sessionID)
|
|
{
|
|
sessionID=[request cookieValueForKey:GSWKey_SessionID[GSWebNamingConv]];
|
|
NSDebugMLog(@"sessionID=%@",sessionID);
|
|
};
|
|
if (sessionID)
|
|
{
|
|
[aContext _setRequestSessionID:sessionID];
|
|
};
|
|
LOGObjectFnStop();
|
|
};
|
|
|
|
@end
|
|
|
|
//====================================================================
|
|
@implementation GSWDirectAction (GSWDirectActionA)
|
|
-(GSWContext*)_context
|
|
{
|
|
//OK
|
|
return _context;
|
|
};
|
|
|
|
//--------------------------------------------------------------------
|
|
-(GSWSession*)_session
|
|
{
|
|
LOGObjectFnNotImplemented(); //TODOFN
|
|
return nil;
|
|
};
|
|
|
|
@end
|
|
//====================================================================
|
|
@implementation GSWDirectAction (GSWTakeValuesConvenience)
|
|
|
|
//--------------------------------------------------------------------
|
|
-(void)takeFormValueArraysForKeyArray:(NSArray*)keyArray
|
|
{
|
|
LOGObjectFnNotImplemented(); //TODOFN
|
|
};
|
|
|
|
//--------------------------------------------------------------------
|
|
-(void)takeFormValuesForKeyArray:(NSArray*)keyArray
|
|
{
|
|
LOGObjectFnNotImplemented(); //TODOFN
|
|
};
|
|
|
|
//--------------------------------------------------------------------
|
|
-(void)takeFormValueArraysForKeys:(NSString*)firstKey,...
|
|
{
|
|
LOGObjectFnNotImplemented(); //TODOFN
|
|
};
|
|
|
|
//--------------------------------------------------------------------
|
|
-(void)takeFormValuesForKeys:(NSString*)firstKey,...
|
|
{
|
|
LOGObjectFnNotImplemented(); //TODOFN
|
|
};
|
|
|
|
@end
|
|
|
|
//====================================================================
|
|
@implementation GSWDirectAction (GSWDebugging)
|
|
|
|
//--------------------------------------------------------------------
|
|
-(void)logWithString:(NSString*)string
|
|
{
|
|
LOGObjectFnNotImplemented(); //TODOFN
|
|
};
|
|
|
|
//--------------------------------------------------------------------
|
|
-(void)logWithFormat:(NSString*)format,...
|
|
{
|
|
LOGObjectFnNotImplemented(); //TODOFN
|
|
};
|
|
|
|
//--------------------------------------------------------------------
|
|
+(void)logWithFormat:(NSString*)format,...
|
|
{
|
|
LOGClassFnNotImplemented(); //TODOFN
|
|
};
|
|
|
|
//--------------------------------------------------------------------
|
|
-(void)_debugWithString:(NSString*)string
|
|
{
|
|
LOGObjectFnNotImplemented(); //TODOFN
|
|
};
|
|
|
|
//--------------------------------------------------------------------
|
|
-(void)debugWithFormat:(NSString*)format,...
|
|
{
|
|
LOGObjectFnNotImplemented(); //TODOFN
|
|
};
|
|
|
|
@end
|
|
|
|
|