8439915015

Committed 26 Mar 2024 04:59PM UTC coverage: 63.934% (-0.1%) from 64.043%

Build # 8439915015

Build Type

Pull #1316

github

Committed by

web-flow

Commit Message

Merge 8572b8d20 into 57fc2b025

Pull Request Pull Request #1316: [Bug] Restore `default button type` to `MessageWindow` for blocked events

Run Details

4654 of 9530 branches covered (48.84%)

Branch coverage included in aggregate %.

0 of 4 new or added lines in 2 files covered. (0.0%)

32 existing lines in 2 files now uncovered.

16289 of 23227 relevant lines covered (70.13%)

13120.6 hits per line

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

38.71

/Source/gui/SNTBinaryMessageWindowController.m

/// Copyright 2015 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 "Source/gui/SNTBinaryMessageWindowController.h"

#import <MOLCertificate/MOLCertificate.h>
#import <SecurityInterface/SFCertificatePanel.h>

#import "Source/common/CertificateHelpers.h"
#import "Source/common/SNTBlockMessage.h"
#import "Source/common/SNTConfigurator.h"
#import "Source/common/SNTStoredEvent.h"

@interface SNTBinaryMessageWindowController ()
///  The custom message to display for this event
@property(copy) NSString *customMessage;

///  The custom URL to use for this event
@property(copy) NSString *customURL;

///  A 'friendly' string representing the certificate information
@property(readonly, nonatomic) NSString *publisherInfo;

///  An optional message to display with this block.
@property(readonly, nonatomic) NSAttributedString *attributedCustomMessage;

///  Reference to the "Application Name" label in the XIB. Used to remove if application
///  doesn't have a CFBundleName.
@property(weak) IBOutlet NSTextField *applicationNameLabel;

@end

@implementation SNTBinaryMessageWindowController

- (instancetype)initWithEvent:(SNTStoredEvent *)event
                    customMsg:(NSString *)message
                    customURL:(NSString *)url {
  self = [super initWithWindowNibName:@"MessageWindow"];
  if (self) {
    _event = event;
    _customMessage = message;
    _customURL = url;
    _progress = [NSProgress discreteProgressWithTotalUnitCount:1];
    [_progress addObserver:self
                forKeyPath:@"fractionCompleted"
                   options:NSKeyValueObservingOptionNew
                   context:NULL];
  }
  return self;
}

- (void)dealloc {
  [_progress removeObserver:self forKeyPath:@"fractionCompleted"];
}

- (void)observeValueForKeyPath:(NSString *)keyPath
                      ofObject:(id)object
                        change:(NSDictionary *)change
                       context:(void *)context {
  if ([keyPath isEqualToString:@"fractionCompleted"]) {
    dispatch_async(dispatch_get_main_queue(), ^{
      NSProgress *progress = object;
      if (progress.fractionCompleted != 0.0) {
        self.hashingIndicator.indeterminate = NO;
      }
      self.hashingIndicator.doubleValue = progress.fractionCompleted;
    });
  }
}

- (void)loadWindow {
  [super loadWindow];
  NSURL *url = [SNTBlockMessage eventDetailURLForEvent:self.event customURL:self.customURL];

  if (!url) {
    [self.openEventButton removeFromSuperview];
  } else if (self.customURL.length == 0) {
    // Set the button text only if a per-rule custom URL is not used. If a
    // custom URL is used, it is assumed that the `EventDetailText` config value
    // does not apply and the default text will be used.
    NSString *eventDetailText = [[SNTConfigurator configurator] eventDetailText];
    if (eventDetailText) {
      [self.openEventButton setTitle:eventDetailText];
      [self.openEventButton setKeyEquivalent:@"\r"];
      [self.openEventButton setKeyEquivalentModifierMask:!NSEventModifierFlagCommand];
    }
  }

  if (!self.event.needsBundleHash) {
    [self.bundleHashLabel removeFromSuperview];
    [self.hashingIndicator removeFromSuperview];
    [self.foundFileCountLabel removeFromSuperview];
  } else {
    self.openEventButton.enabled = NO;
    self.hashingIndicator.indeterminate = YES;
    [self.hashingIndicator startAnimation:self];
    self.bundleHashLabel.hidden = YES;
    self.foundFileCountLabel.stringValue = @"";
  }

  if (!self.event.fileBundleName) {
    [self.applicationNameLabel removeFromSuperview];
  }
}

- (NSString *)messageHash {
  return self.event.fileSHA256;
}

- (IBAction)showCertInfo:(id)sender {
  // SFCertificatePanel expects an NSArray of SecCertificateRef's
  [[[SFCertificatePanel alloc] init] beginSheetForWindow:self.window
                                           modalDelegate:nil
                                          didEndSelector:nil
                                             contextInfo:nil
                                            certificates:CertificateChain(self.event.signingChain)
                                               showGroup:YES];
}

- (IBAction)openEventDetails:(id)sender {
  NSURL *url = [SNTBlockMessage eventDetailURLForEvent:self.event customURL:self.customURL];

  [self closeWindow:sender];
  [[NSWorkspace sharedWorkspace] openURL:url];
}

#pragma mark Generated properties

+ (NSSet *)keyPathsForValuesAffectingValueForKey:(NSString *)key {
  if (![key isEqualToString:@"event"]) {
    return [NSSet setWithObject:@"event"];
  } else {
    return [NSSet set];
  }
}

- (NSString *)publisherInfo {
  return Publisher(self.event.signingChain, self.event.teamID);
}

- (NSAttributedString *)attributedCustomMessage {
  return [SNTBlockMessage attributedBlockMessageForEvent:self.event
                                           customMessage:self.customMessage];
}

- (void)updateBlockNotification:(SNTStoredEvent *)event withBundleHash:(NSString *)bundleHash {
  // UI updates must happen on the main thread.
  dispatch_async(dispatch_get_main_queue(), ^{
    if ([self.event.idx isEqual:event.idx]) {
      if (bundleHash) {
        [self.bundleHashLabel setHidden:NO];
      } else {
        [self.bundleHashLabel removeFromSuperview];
        [self.bundleHashTitle removeFromSuperview];
      }
      self.event.fileBundleHash = bundleHash;
      [self.foundFileCountLabel removeFromSuperview];
      [self.hashingIndicator setHidden:YES];
      [self.openEventButton setEnabled:YES];
    }
  });
}

@end

1	/// Copyright 2015 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
15	#import "Source/gui/SNTBinaryMessageWindowController.h"
16
17	#import <MOLCertificate/MOLCertificate.h>
18	#import <SecurityInterface/SFCertificatePanel.h>
19
20	#import "Source/common/CertificateHelpers.h"
21	#import "Source/common/SNTBlockMessage.h"
22	#import "Source/common/SNTConfigurator.h"
23	#import "Source/common/SNTStoredEvent.h"
24
25	@interface SNTBinaryMessageWindowController ()
26	/// The custom message to display for this event
27	@property(copy) NSString *customMessage;
28
29	/// The custom URL to use for this event
30	@property(copy) NSString *customURL;
31
32	/// A 'friendly' string representing the certificate information
33	@property(readonly, nonatomic) NSString *publisherInfo;
34
35	/// An optional message to display with this block.
36	@property(readonly, nonatomic) NSAttributedString *attributedCustomMessage;
37
38	/// Reference to the "Application Name" label in the XIB. Used to remove if application
39	/// doesn't have a CFBundleName.
40	@property(weak) IBOutlet NSTextField *applicationNameLabel;
41
42	@end
43
44	@implementation SNTBinaryMessageWindowController
45
46	- (instancetype)initWithEvent:(SNTStoredEvent *)event
47	customMsg:(NSString *)message
48	customURL:(NSString *)url {	1✔
49	self = [super initWithWindowNibName:@"MessageWindow"];	1✔
50	if (self) {	1!
51	_event = event;	1✔
52	_customMessage = message;	1✔
53	_customURL = url;	1✔
54	_progress = [NSProgress discreteProgressWithTotalUnitCount:1];	1✔
55	[_progress addObserver:self	1✔
56	forKeyPath:@"fractionCompleted"	1✔
57	options:NSKeyValueObservingOptionNew	1✔
58	context:NULL];	1✔
59	}	1✔
60	return self;	1✔
61	}	1✔
62
63	- (void)dealloc {	×
64	[_progress removeObserver:self forKeyPath:@"fractionCompleted"];	×
65	}	×
66
67	- (void)observeValueForKeyPath:(NSString *)keyPath
68	ofObject:(id)object
69	change:(NSDictionary *)change
70	context:(void *)context {	×
71	if ([keyPath isEqualToString:@"fractionCompleted"]) {	×
72	dispatch_async(dispatch_get_main_queue(), ^{	×
73	NSProgress *progress = object;	×
74	if (progress.fractionCompleted != 0.0) {	×
75	self.hashingIndicator.indeterminate = NO;	×
76	}	×
77	self.hashingIndicator.doubleValue = progress.fractionCompleted;	×
78	});	×
79	}	×
80	}	×
81
82	- (void)loadWindow {	1✔
83	[super loadWindow];	1✔
84	NSURL *url = [SNTBlockMessage eventDetailURLForEvent:self.event customURL:self.customURL];	1✔
85
86	if (!url) {	1!
87	[self.openEventButton removeFromSuperview];	1✔
88	} else if (self.customURL.length == 0) {	×
89	// Set the button text only if a per-rule custom URL is not used. If a
90	// custom URL is used, it is assumed that the `EventDetailText` config value
91	// does not apply and the default text will be used.
92	NSString *eventDetailText = [[SNTConfigurator configurator] eventDetailText];	×
93	if (eventDetailText) {	×
94	[self.openEventButton setTitle:eventDetailText];	×
NEW 95	[self.openEventButton setKeyEquivalent:@"\r"];	×
NEW 96	[self.openEventButton setKeyEquivalentModifierMask:!NSEventModifierFlagCommand];	×
97	}	×
98	}	×
99
100	if (!self.event.needsBundleHash) {	1!
101	[self.bundleHashLabel removeFromSuperview];	1✔
102	[self.hashingIndicator removeFromSuperview];	1✔
103	[self.foundFileCountLabel removeFromSuperview];	1✔
104	} else {	×
105	self.openEventButton.enabled = NO;	×
106	self.hashingIndicator.indeterminate = YES;	×
107	[self.hashingIndicator startAnimation:self];	×
108	self.bundleHashLabel.hidden = YES;	×
109	self.foundFileCountLabel.stringValue = @"";	×
110	}	×
111
112	if (!self.event.fileBundleName) {	1!
113	[self.applicationNameLabel removeFromSuperview];	×
114	}	×
115	}	1✔
116
117	- (NSString *)messageHash {	1✔
118	return self.event.fileSHA256;	1✔
119	}	1✔
120
121	- (IBAction)showCertInfo:(id)sender {	×
122	// SFCertificatePanel expects an NSArray of SecCertificateRef's
123	[[[SFCertificatePanel alloc] init] beginSheetForWindow:self.window	×
124	modalDelegate:nil	×
125	didEndSelector:nil	×
126	contextInfo:nil	×
127	certificates:CertificateChain(self.event.signingChain)	×
128	showGroup:YES];	×
129	}	×
130
131	- (IBAction)openEventDetails:(id)sender {	×
132	NSURL *url = [SNTBlockMessage eventDetailURLForEvent:self.event customURL:self.customURL];	×
133
134	[self closeWindow:sender];	×
135	[[NSWorkspace sharedWorkspace] openURL:url];	×
136	}	×
137
138	#pragma mark Generated properties
139
140	+ (NSSet )keyPathsForValuesAffectingValueForKey:(NSString )key {	9✔
141	if (![key isEqualToString:@"event"]) {	9✔
142	return [NSSet setWithObject:@"event"];	4✔
143	} else {	5✔
144	return [NSSet set];	5✔
145	}	5✔
146	}	9✔
147
148	- (NSString *)publisherInfo {	2✔
149	return Publisher(self.event.signingChain, self.event.teamID);	2✔
150	}	2✔
151
152	- (NSAttributedString *)attributedCustomMessage {	1✔
153	return [SNTBlockMessage attributedBlockMessageForEvent:self.event	1✔
154	customMessage:self.customMessage];	1✔
155	}	1✔
156
157	- (void)updateBlockNotification:(SNTStoredEvent )event withBundleHash:(NSString )bundleHash {	×
158	// UI updates must happen on the main thread.
159	dispatch_async(dispatch_get_main_queue(), ^{	×
160	if ([self.event.idx isEqual:event.idx]) {	×
161	if (bundleHash) {	×
162	[self.bundleHashLabel setHidden:NO];	×
163	} else {	×
164	[self.bundleHashLabel removeFromSuperview];	×
165	[self.bundleHashTitle removeFromSuperview];	×
166	}	×
167	self.event.fileBundleHash = bundleHash;	×
168	[self.foundFileCountLabel removeFromSuperview];	×
169	[self.hashingIndicator setHidden:YES];	×
170	[self.openEventButton setEnabled:YES];	×
171	}	×
172	});	×
173	}	×
174
175	@end

google / santa / 8439915015

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