gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-30 08:21:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Changes to avoid placing sensitive information in debug logs.

Browse source
This commit is contained in:
Richard Frith-Macdonald 2022-05-20 12:32:31 +01:00
parent cc38f2f4a1
commit 1934ce6205
4 changed files with 212 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

39
Source/NSURLProtocol.m
View file

@ -47,6 +47,11 @@
#import "GNUstepBase/NSString+GNUstepBase.h"
#import "GNUstepBase/NSURL+GNUstepBase.h"
@interface GSMimeHeader (HTTPRequest)
- (void) addToBuffer: (NSMutableData*)buf
masking: (NSMutableData**)masked;
@end
/* Define to 1 for experimental (net yet working) compression support
*/
#ifdef USE_ZLIB
@ -355,8 +360,9 @@ static NSLock *pairLock = nil;
float _version; // The HTTP version in use.
int _statusCode; // The HTTP status code returned.
NSInputStream *_body; // for sending the body
unsigned _writeOffset; // Request data to write
NSData *_writeData; // Request bytes written so far
unsigned _writeOffset; // Request bytes written so far
NSData *_writeData; // Request data to write
NSData *_masked; // Request masked data
BOOL _complete;
BOOL _debug;
BOOL _isLoading;
@ -780,6 +786,8 @@ typedef struct {
[_body release]; // for sending the body
[_response release];
[_credential release];
DESTROY(_writeData);
DESTROY(_masked);
[super dealloc];
}
@ -1002,6 +1010,7 @@ typedef struct {
}
_isLoading = NO;
DESTROY(_writeData);
DESTROY(_masked);
if (this->input != nil)
{
[this->input setDelegate: nil];
@ -1533,17 +1542,24 @@ typedef struct {
{
if (_debug)
{
if (NO == [_logDelegate putBytes: bytes + _writeOffset
const unsigned char *b = [_masked bytes];
if (NULL == b)
{
b = bytes;
}
if (NO == [_logDelegate putBytes: b + _writeOffset
ofLength: written
byHandle: self])
{
debugWrite(self, written, bytes + _writeOffset);
debugWrite(self, written, b + _writeOffset);
}
}
_writeOffset += written;
if (_writeOffset >= len)
{
DESTROY(_writeData);
DESTROY(_masked);
if (_body == nil)
{
_body = RETAIN([this->request HTTPBodyStream]);
@ -1710,6 +1726,7 @@ typedef struct {
case NSStreamEventOpenCompleted:
{
NSMutableData *m;
NSMutableData *mm = nil;
NSDictionary *d;
NSEnumerator *e;
NSString *s;
@ -1733,6 +1750,7 @@ typedef struct {
[stream propertyForKey: GSStreamRemoteAddressKey],
[stream propertyForKey: GSStreamRemotePortKey]];
DESTROY(_writeData);
DESTROY(_masked);
_writeOffset = 0;
if ([this->request HTTPBodyStream] == nil)
{
@ -1783,8 +1801,14 @@ typedef struct {
h = [[GSMimeHeader alloc] initWithName: s
value: [d objectForKey: s]
parameters: nil];
[m appendData:
[h rawMimeDataPreservingCase: YES foldedAt: 0]];
if (_debug || mm)
{
[h addToBuffer: m masking: &mm];
}
else
{
[h addToBuffer: m masking: NULL];
}
RELEASE(h);
}
@ -1839,7 +1863,8 @@ typedef struct {
[m appendData: [s dataUsingEncoding: NSASCIIStringEncoding]];
}
[m appendBytes: "\r\n" length: 2]; // End of headers
_writeData = m;
_writeData = m;
ASSIGN(_masked, mm);
} // Fall through to do the write
case NSStreamEventHasSpaceAvailable: