4021355406

Build Type

github

Committed by GitHub

Commit Message

<a href="https://github.com/google/santa/commit/<a class=hub.com/google/santa/commit/<a class="double-link" href="https://git"><a class=hub.com/google/santa/commit/<a class="double-link" href="https://git"><a class=hub.com/google/santa/commit/c53fa4be5692ef6ca795ed6a941f5330a038a53d">c53fa4be5<a href="https://github.com/google/santa/commit/c53fa4be5692ef6ca795ed6a941f5330a038a53d">&quot;&gt;&amp;lt;a href=&amp;quot;https://github.com/google/santa/commit/&lt;/a&gt;&lt;a class=&quot;double-link&quot; href=&quot;https://github.com/google/santa/commit/&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://git&quot;&gt;&amp;lt;a class=&lt;/a&gt;hub.com/google/santa/commit/c53fa4be5692ef6ca795ed6a941f5330a038a53d&quot;&gt;c53fa4be5&lt;/a&gt;&lt;a href=&quot;https://github.com/google/santa/commit/c53fa4be5692ef6ca795ed6a941f5330a038a53d&quot;&gt;&amp;lt;a href=&amp;quot;https://github.com/google/santa/commit/c53fa4be5692ef6ca795ed6a941f5330&lt;/a&gt;a038a53d">&quot;&gt;Merge &lt;/a&gt;&lt;a class=&quot;double-link&quot; href=&quot;https://github.com/google/santa/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://github.com/google/santa/commit/<a class="double-link" href="https://github.com/google/santa/commit/0ce06b1c492f4a593bb156b991e1925d9c71d584">0ce06b1c4</a><a href="https://github.com/google/santa/commit/c53fa4be5692ef6ca795ed6a941f5330a038a53d">&amp;quot;&amp;gt;0ce06b1c4&amp;lt;/a&amp;gt;&amp;quot;&amp;gt;0ce06b1c4&amp;lt;/a&amp;gt;&amp;lt;a href=&amp;quot;https://github.com/google/santa/commit/c53fa4be5692ef6ca795ed6a941f5330a038a&lt;/a&gt;53d&quot;&gt; into &lt;/a&gt;&lt;a class=&quot;double-link&quot; href=&quot;https://github.com/google/santa/commit/<a class="double-link" href="https://github.com/google/santa/commit/b4149816c">b4149816c">b4149816c</a>

Pull Request Pull Request #1019: Fix: Rewrite the SNTMetricHTTPWriter to avoid potential stack corruption

Run Details

3798 of 7728 branches covered (49.15%)

Branch coverage included in aggregate %.

17 of 17 new or added lines in 1 file covered. (100.0%)

13436 of 18914 relevant lines covered (71.04%)

14613.37 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

82.72

/Source/santametricservice/Writers/SNTMetricHTTPWriter.m

/// Copyright 2021 Google Inc. All rights reserved.
///
/// Licensed under the Apache License, Version 2.0 (the "License");
/// you may not use this file except in compliance with the License.
/// You may obtain a copy of the License at
///
///    http://www.apache.org/licenses/LICENSE-2.0
///
///    Unless required by applicable law or agreed to in writing, software
///    distributed under the License is distributed on an "AS IS" BASIS,
///    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
///    See the License for the specific language governing permissions and
///    limitations under the License.
#import <MOLAuthenticatingURLSession/MOLAuthenticatingURLSession.h>
#include <dispatch/dispatch.h>

#import "Source/common/SNTConfigurator.h"
#import "Source/common/SNTLogging.h"
#import "Source/santametricservice/Writers/SNTMetricHTTPWriter.h"

@implementation SNTMetricHTTPWriter {
 @private
  MOLAuthenticatingURLSession *_authSession;
}

- (instancetype)init {
  self = [super init];
  if (self) {
    _authSession = [[MOLAuthenticatingURLSession alloc] init];
  }
  return self;
}

/**
 * Post serialzied metrics to the specified URL one object at a time.
 **/
- (BOOL)write:(NSArray<NSData *> *)metrics toURL:(NSURL *)url error:(NSError **)error {
  __block NSError *_blockError = nil;

  NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:url];
  request.HTTPMethod = @"POST";
  [request setValue:@"application/json" forHTTPHeaderField:@"Content-Type"];

  _authSession.serverHostname = url.host;
  NSURLSession *_session = _authSession.session;
  NSURLSessionDataTask *task;

  dispatch_group_t requests = dispatch_group_create();
  for (NSData *metric in metrics) {
    dispatch_group_enter(requests);

    request.HTTPBody = (NSData *)metric;
    task = [_session
      dataTaskWithRequest:request
        completionHandler:^(NSData *_Nullable data, NSURLResponse *_Nullable response,
                            NSError *_Nullable err) {
          if (err != nil) {
            _blockError = err;
          } else if (response == nil) {
            _blockError = nil;
          } else if ([response isKindOfClass:[NSHTTPURLResponse class]]) {
            NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)response;

            // Check HTTP error codes and create errors for any non-200.
            if (httpResponse && httpResponse.statusCode != 200) {
              _blockError = [[NSError alloc]
                initWithDomain:@"com.google.santa.metricservice.writers.http"
                          code:httpResponse.statusCode
                      userInfo:@{
                        NSLocalizedDescriptionKey :
                          [NSString stringWithFormat:@"received http status code %ld from %@",
                                                     httpResponse.statusCode, url]
                      }];
            }
          }
          dispatch_group_leave(requests);
        }];

    [task resume];
  }

  SNTConfigurator *config = [SNTConfigurator configurator];
  int64_t timeout = (int64_t)config.metricExportTimeout;

  // Wait up to timeout seconds for the request to complete.
  if (dispatch_group_wait(requests, dispatch_time(DISPATCH_TIME_NOW, timeout * NSEC_PER_SEC)) !=
      0) {
    [task cancel];
    NSString *errMsg = [NSString stringWithFormat:@"HTTP request to %@ timed out after %lu seconds",
                                                  url, (unsigned long)timeout];

    _blockError = [[NSError alloc] initWithDomain:@"com.google.santa.metricservice.writers.http"
                                             code:ETIMEDOUT
                                         userInfo:@{NSLocalizedDescriptionKey : errMsg}];
  }

  if (_blockError != nil) {
    // If the caller hasn't passed us an error then we ignore it.
    if (error != nil) {
      *error = [_blockError copy];
    }

    return NO;
  }

  return YES;
}
@end

1	/// Copyright 2021 Google Inc. All rights reserved.
2	///
3	/// Licensed under the Apache License, Version 2.0 (the "License");
4	/// you may not use this file except in compliance with the License.
5	/// You may obtain a copy of the License at
6	///
7	/// http://www.apache.org/licenses/LICENSE-2.0
8	///
9	/// Unless required by applicable law or agreed to in writing, software
10	/// distributed under the License is distributed on an "AS IS" BASIS,
11	/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12	/// See the License for the specific language governing permissions and
13	/// limitations under the License.
14	#import <MOLAuthenticatingURLSession/MOLAuthenticatingURLSession.h>
15	#include <dispatch/dispatch.h>
16
17	#import "Source/common/SNTConfigurator.h"
18	#import "Source/common/SNTLogging.h"
19	#import "Source/santametricservice/Writers/SNTMetricHTTPWriter.h"
20
21	@implementation SNTMetricHTTPWriter {
22	@private
23	MOLAuthenticatingURLSession *_authSession;
24	}
25
26	- (instancetype)init {	11✔
27	self = [super init];	11✔
28	if (self) {	11!
29	_authSession = [[MOLAuthenticatingURLSession alloc] init];	11✔
30	}	11✔
31	return self;	11✔
32	}	11✔
33
34	/**
35	* Post serialzied metrics to the specified URL one object at a time.
36	**/
37	- (BOOL)write:(NSArray<NSData > )metrics toURL:(NSURL )url error:(NSError *)error {	11✔
38	__block NSError *_blockError = nil;	11✔
39
40	NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:url];	11✔
41	request.HTTPMethod = @"POST";	11✔
42	[request setValue:@"application/json" forHTTPHeaderField:@"Content-Type"];	11✔
43
44	_authSession.serverHostname = url.host;	11✔
45	NSURLSession *_session = _authSession.session;	11✔
46	NSURLSessionDataTask *task;	11✔
47
48	dispatch_group_t requests = dispatch_group_create();	11✔
49	for (NSData *metric in metrics) {	12✔
50	dispatch_group_enter(requests);	12✔
51
52	request.HTTPBody = (NSData *)metric;	12✔
53	task = [_session	12✔
54	dataTaskWithRequest:request	12✔
55	completionHandler:^(NSData _Nullable data, NSURLResponse _Nullable response,	12✔
56	NSError *_Nullable err) {	12✔
57	if (err != nil) {	12✔
58	_blockError = err;	3✔
59	} else if (response == nil) {	9!
60	_blockError = nil;	×
61	} else if ([response isKindOfClass:[NSHTTPURLResponse class]]) {	9!
62	NSHTTPURLResponse httpResponse = (NSHTTPURLResponse )response;	9✔
63
64	// Check HTTP error codes and create errors for any non-200.
65	if (httpResponse && httpResponse.statusCode != 200) {	9!
66	_blockError = [[NSError alloc]	5✔
67	initWithDomain:@"com.google.santa.metricservice.writers.http"	5✔
68	code:httpResponse.statusCode	5✔
69	userInfo:@{	5✔
70	NSLocalizedDescriptionKey :	5✔
71	[NSString stringWithFormat:@"received http status code %ld from %@",	5✔
72	httpResponse.statusCode, url]	5✔
73	}];	5✔
74	}	5✔
75	}	9✔
76	dispatch_group_leave(requests);	12✔
77	}];	12✔
78
79	[task resume];	12✔
80	}	12✔
81
82	SNTConfigurator *config = [SNTConfigurator configurator];	11✔
83	int64_t timeout = (int64_t)config.metricExportTimeout;	11✔
84
85	// Wait up to timeout seconds for the request to complete.
86	if (dispatch_group_wait(requests, dispatch_time(DISPATCH_TIME_NOW, timeout * NSEC_PER_SEC)) !=	11!
87	0) {	×
88	[task cancel];	×
89	NSString *errMsg = [NSString stringWithFormat:@"HTTP request to %@ timed out after %lu seconds",	×
90	url, (unsigned long)timeout];	×
91
92	_blockError = [[NSError alloc] initWithDomain:@"com.google.santa.metricservice.writers.http"	×
93	code:ETIMEDOUT	×
94	userInfo:@{NSLocalizedDescriptionKey : errMsg}];	×
95	}	×
96
97	if (_blockError != nil) {	11✔
98	// If the caller hasn't passed us an error then we ignore it.
99	if (error != nil) {	8✔
100	*error = [_blockError copy];	3✔
101	}	3✔
102
103	return NO;	8✔
104	}	8✔
105
106	return YES;	3✔
107	}	3✔
108	@end

google / santa / 4021355406

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous