amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-08-21 14:43:31 +00:00
Code Issues Projects Releases Wiki Activity

fix body with extra char

Browse Source
This commit is contained in:
Hivert Quentin
2025-06-23 09:20:07 +02:00
parent b3ba73e8e4
commit 5435e51329
1 changed files with 11 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/SOGo/SOGoOpenIdSession.m
+11 -58
View File
@@ -236,62 +236,6 @@ size_t curl_body_function(void *ptr, size_t size, size_t nmemb, void *buffer)
}
}
// - (WOResponse *) _performOpenIdRequest: (NSString *) endpoint
// method: (NSString *) method
// headers: (NSDictionary *) headers
// body: (NSData *) body
// {
// NSURL *url;
// NSUInteger status;
// WORequest *request;
// WOResponse *response;
// WOHTTPConnection *httpConnection;
// url = [NSURL URLWithString: endpoint];
// if (url)
// {
// if(SOGoOpenIDDebugEnabled)
// {
// NSLog(@"OpenId perform request: %@ %@", method, endpoint);
// NSLog(@"OpenId perform request, headers %@", headers);
// // if(body)
// // NSLog(@"OpenId perform request: content %@", [[NSString alloc] initWithData:body encoding:NSUTF8StringEncoding]);
// }
// httpConnection = [[WOHTTPConnection alloc] initWithURL: url];
// [httpConnection autorelease];
// request = [[WORequest alloc] initWithMethod: method
// uri: [endpoint hostlessURL]
// httpVersion: self->openIdHttpVersion
// headers: headers content: body
// userInfo: nil];
// [request autorelease];
// [httpConnection sendRequest: request];
// response = [httpConnection readResponse];
// status = [response status];
// if(status >= 200 && status <500 && status != 404)
// return response;
// else if (status == 404)
// {
// [self errorWithFormat: @"OpenID endpoint not found (404): %@", endpoint];
// return nil;
// }
// else
// {
// [self errorWithFormat: @"OpenID server internal error during %@: %@", endpoint, response];
// return nil;
// }
// }
// else
// {
// [self errorWithFormat: @"OpenID can't handle endpoint (not a url): '%@'", endpoint];
// return nil;
// }
// }
- (SimpleOpenIdResponse *) _performOpenIdRequest: (NSString *) endpoint
method: (NSString *) method
headers: (NSDictionary *) headers
@@ -332,6 +276,15 @@ size_t curl_body_function(void *ptr, size_t size, size_t nmemb, void *buffer)
//add form
if(body)
{
//Trick because sometimes NSData bytes don't add the \0 at the end and junk character may be added
const char *myBodyTmp = (const char*)[body bytes];
char myBody[[body length]+1];
strncpy(myBody, myBodyTmp, [body length]);
myBody[[body length]]='\0';
if(SOGoOpenIDDebugEnabled)
NSLog(@"OpenId perform request, body %s", myBody);
curl_easy_setopt(curl, CURLOPT_POST, 1);
curl_easy_setopt(curl, CURLOPT_POSTFIELDS, [body bytes]);
}
@@ -734,7 +687,7 @@ size_t curl_body_function(void *ptr, size_t size, size_t nmemb, void *buffer)
self->forDomain, @"sogo-user-domain", nil];
else
headers = [NSDictionary dictionaryWithObject: @"application/x-www-form-urlencoded" forKey: @"content-type"];
response = [self _performOpenIdRequest: location
method: @"POST"
headers: headers
@@ -908,7 +861,7 @@ size_t curl_body_function(void *ptr, size_t size, size_t nmemb, void *buffer)
}
else
{
[self logWithFormat: @"Error detching userinfo (status %d), response: %@", status, response];
[self logWithFormat: @"Error fetching userInfo (status %d), response: %@", status, response];
[result setObject: @"http-error" forKey: @"error"];
}
}