Skip to content

Commit

Permalink
v1.1.2 commit
Browse files Browse the repository at this point in the history 
compile for 10.12+
ignore UDP connections to localhos
process network events one at a time (otherwise, threading issues)
  • Loading branch information
Patrick Wardle committed Oct 23, 2018
1 parent bd14044 commit 38bd210
Show file tree
Hide file tree
Showing 39 changed files with 177 additions and 116 deletions.
6 changes: 3 additions & 3 deletions configure/Configure/Assets.xcassets/FriendsDigita.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"images" : [
{
"idiom" : "mac",
"filename" : "Digita.pdf"
"filename" : "digita.pdf"
},
{
"idiom" : "mac",
"filename" : "Digita-1.pdf",
"filename" : "digitaLight.pdf",
"appearances" : [
{
"appearance" : "luminosity",
Expand All @@ -16,7 +16,7 @@
},
{
"idiom" : "mac",
"filename" : "Digita-2.pdf",
"filename" : "digitaDark.pdf",
"appearances" : [
{
"appearance" : "luminosity",
Expand Down
0 ...ssets/FriendsDigita.imageset/Digita-1.pdf → ...ets/FriendsDigita.imageset/digitaDark.pdf
View file
File renamed without changes.
0 ...ssets/FriendsDigita.imageset/Digita-2.pdf → ...ts/FriendsDigita.imageset/digitaLight.pdf
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions configure/Configure/Assets.xcassets/FriendsMalwarebytes.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
},
{
"idiom" : "mac",
"filename" : "malwarebytes-1.pdf",
"filename" : "malwarebytesLight.pdf",
"appearances" : [
{
"appearance" : "luminosity",
Expand All @@ -16,7 +16,7 @@
},
{
"idiom" : "mac",
"filename" : "malwarebytes-2.pdf",
"filename" : "malwarebytesDark.pdf",
"appearances" : [
{
"appearance" : "luminosity",
Expand Down
0 ...sMalwarebytes.imageset/malwarebytes-1.pdf → ...alwarebytes.imageset/malwarebytesDark.pdf
View file
File renamed without changes.
0 ...sMalwarebytes.imageset/malwarebytes-2.pdf → ...lwarebytes.imageset/malwarebytesLight.pdf
View file
File renamed without changes.
35 changes: 35 additions & 0 deletions configure/Configure/Assets.xcassets/FriendsSophos.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"images" : [
{
"idiom" : "mac",
"filename" : "sophos.png"
},
{
"idiom" : "mac",
"filename" : "sophosLight.png",
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
]
},
{
"idiom" : "mac",
"filename" : "sophosDark.png",
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
]
}
],
"info" : {
"version" : 1,
"author" : "xcode"
},
"properties" : {
"preserves-vector-representation" : true
}
}
Binary file added configure/Configure/Assets.xcassets/FriendsSophos.imageset/sophos.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added configure/Configure/Assets.xcassets/FriendsSophos.imageset/sophosDark.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added configure/Configure/Assets.xcassets/FriendsSophos.imageset/sophosLight.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions configure/Configure/Assets.xcassets/InstallerIcon.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
},
{
"idiom" : "mac",
"filename" : "luluIcon-1.pdf",
"filename" : "luluIconLight.pdf",
"appearances" : [
{
"appearance" : "luminosity",
Expand All @@ -16,7 +16,7 @@
},
{
"idiom" : "mac",
"filename" : "luluIcon_dark.pdf",
"filename" : "luluIconDark.pdf",
"appearances" : [
{
"appearance" : "luminosity",
Expand Down
0 .../InstallerIcon.imageset/luluIcon_dark.pdf → ...s/InstallerIcon.imageset/luluIconDark.pdf
View file
File renamed without changes.
0 ...ets/InstallerIcon.imageset/luluIcon-1.pdf → .../InstallerIcon.imageset/luluIconLight.pdf
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions configure/Configure/Assets.xcassets/InstallerLuLuText.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"images" : [
{
"idiom" : "mac",
"filename" : "lulu_text.pdf"
"filename" : "luluText.pdf"
},
{
"idiom" : "mac",
"filename" : "lulu_text-1.pdf",
"filename" : "luluTextLight.pdf",
"appearances" : [
{
"appearance" : "luminosity",
Expand All @@ -16,7 +16,7 @@
},
{
"idiom" : "mac",
"filename" : "lulu_text-2.pdf",
"filename" : "luluTextDark.pdf",
"appearances" : [
{
"appearance" : "luminosity",
Expand Down
0 ...nstallerLuLuText.imageset/lulu_text-1.pdf → ...s/InstallerLuLuText.imageset/luluText.pdf
View file
File renamed without changes.
0 ...nstallerLuLuText.imageset/lulu_text-2.pdf → ...stallerLuLuText.imageset/luluTextDark.pdf
View file
File renamed without changes.
0 .../InstallerLuLuText.imageset/lulu_text.pdf → ...tallerLuLuText.imageset/luluTextLight.pdf
View file
File renamed without changes.
31 changes: 23 additions & 8 deletions configure/Configure/ConfigureWindowController.xib
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14313.13.2" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14313.13.2"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14313.18"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
Expand Down Expand Up @@ -106,7 +106,7 @@
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="s5m-Bo-NlS">
<rect key="frame" x="68" y="59" width="138" height="19"/>
<rect key="frame" x="39" y="57" width="135" height="19"/>
<autoresizingMask key="autoresizingMask"/>
<textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="Digita Security" id="MtN-NI-kav">
<font key="font" size="13" name="Menlo-Regular"/>
Expand All @@ -115,14 +115,14 @@
</textFieldCell>
</textField>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="C7S-GH-AYp">
<rect key="frame" x="117" y="84" width="40" height="50"/>
<rect key="frame" x="78" y="80" width="48" height="60"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="FriendsDigita" id="fwj-wn-r5b"/>
</imageView>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="pqf-EC-ZHk">
<rect key="frame" x="296" y="84" width="65" height="50"/>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="YBz-bV-qIw">
<rect key="frame" x="198" y="84" width="65" height="50"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="FriendsMalwarebytes" id="1ys-ig-b1N"/>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="FriendsSophos" id="P6w-a1-9JX"/>
</imageView>
<button verticalHuggingPriority="750" fixedFrame="YES" tag="-1" translatesAutoresizingMaskIntoConstraints="NO" id="Xfy-pO-bPJ">
<rect key="frame" x="331" y="13" width="115" height="32"/>
Expand All @@ -135,22 +135,37 @@
<action selector="buttonHandler:" target="-2" id="3PB-dL-p78"/>
</connections>
</button>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="0m6-no-UxH">
<rect key="frame" x="161" y="57" width="138" height="19"/>
<autoresizingMask key="autoresizingMask"/>
<textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="Sophos" id="bur-GX-u7b">
<font key="font" size="13" name="Menlo-Regular"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hrx-qN-4t2">
<rect key="frame" x="259" y="59" width="138" height="19"/>
<rect key="frame" x="306" y="57" width="108" height="19"/>
<autoresizingMask key="autoresizingMask"/>
<textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="Malwarebytes" id="SJb-zK-MOr">
<font key="font" size="13" name="Menlo-Regular"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="pqf-EC-ZHk">
<rect key="frame" x="325" y="82" width="71" height="57"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="FriendsMalwarebytes" id="1ys-ig-b1N"/>
</imageView>
</subviews>
<point key="canvasLocation" x="785" y="-256"/>
</customView>
</objects>
<resources>
<image name="FriendsDigita" width="450" height="460"/>
<image name="FriendsMalwarebytes" width="792" height="612"/>
<image name="FriendsSophos" width="188" height="190"/>
<image name="InstallerIcon" width="1276" height="1276"/>
<image name="InstallerLuLuText" width="1268" height="385"/>
</resources>
Expand Down
Binary file removed configure/Configure/Images/digita.png
View file
Binary file not shown.
Binary file removed configure/Configure/Images/malwarebytes.png
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions configure/Configure/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.1.1</string>
<string>1.1.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.1.1</string>
<string>1.1.2</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright (c) 2018 Objective-See. All rights reserved.</string>
<key>NSMainNibFile</key>
Expand Down
6 changes: 3 additions & 3 deletions configure/Configure/Script/configure.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
INSTALL_DIRECTORY="/Library/Objective-See/LuLu"

#OS version check
# only support 10.10+
# only support 10.12+
OSVers="$(sw_vers -productVersion)"
if [ "${OSVers:3:2}" -lt 10 ]; then
if [ "${OSVers:3:2}" -lt 12 ]; then
echo "\nERROR: ${OSVers} is currently unsupported"
echo "LuLu requires macOS 10.10+\n"
echo "LuLu requires macOS 10.12+\n"
exit -1
fi

Expand Down
6 changes: 3 additions & 3 deletions configure/Helper/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
<key>CFBundleName</key>
<string>helper</string>
<key>CFBundleShortVersionString</key>
<string>1.1.1</string>
<string>1.1.2</string>
<key>CFBundleVersion</key>
<string>1.1.1</string>
<string>1.1.2</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright (c) 2018 Objective-See. All rights reserved.</string>
<key>SMAuthorizedClients</key>
<array>
<string>anchor apple generic and identifier "com.objective-see.lulu.installer" and (certificate leaf[field.1.2.840.113635.100.6.1.9] /* exists */ or certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = VBG97UB4TA)</string>
<string>anchor apple generic and identifier &quot;com.objective-see.lulu.installer&quot; and (certificate leaf[field.1.2.840.113635.100.6.1.9] /* exists */ or certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = VBG97UB4TA)</string>
</array>
</dict>
</plist>
12 changes: 4 additions & 8 deletions configure/configure.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,7 @@
CD73DA98200490B4001FFC84 /* HelperComms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HelperComms.h; sourceTree = "<group>"; };
CDA6E62C203B674C00C78F91 /* configure.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = configure.sh; sourceTree = "<group>"; };
CDA6E62E203B67A100C78F91 /* consts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = consts.h; path = ../../shared/consts.h; sourceTree = "<group>"; };
CDA6E631203B6B7800C78F91 /* luluText.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = luluText.png; path = ../../shared/images/luluText.png; sourceTree = "<group>"; };
CDA6E632203B6B7800C78F91 /* objectiveSeeText.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = objectiveSeeText.png; path = ../../shared/images/objectiveSeeText.png; sourceTree = "<group>"; };
CDA6E633203B6B7900C78F91 /* luluIcon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = luluIcon.png; path = ../../shared/images/luluIcon.png; sourceTree = "<group>"; };
CDA6E634203B6B7900C78F91 /* objectiveSeeLogo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = objectiveSeeLogo.png; path = ../../shared/images/objectiveSeeLogo.png; sourceTree = "<group>"; };
CDAAC23F202255580032F2E6 /* utilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = utilities.m; path = ../../shared/utilities.m; sourceTree = "<group>"; };
CDAAC240202255580032F2E6 /* utilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = utilities.h; path = ../../shared/utilities.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -244,8 +242,6 @@
CDAAC24620226D400032F2E6 /* Images */ = {
isa = PBXGroup;
children = (
CDA6E633203B6B7900C78F91 /* luluIcon.png */,
CDA6E631203B6B7800C78F91 /* luluText.png */,
CDA6E634203B6B7900C78F91 /* objectiveSeeLogo.png */,
CDA6E632203B6B7800C78F91 /* objectiveSeeText.png */,
);
Expand Down Expand Up @@ -477,7 +473,7 @@
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO;
INFOPLIST_FILE = configure/Info.plist;
LIBRARY_SEARCH_PATHS = "";
MACOSX_DEPLOYMENT_TARGET = 10.10;
MACOSX_DEPLOYMENT_TARGET = 10.12;
OTHER_CODE_SIGN_FLAGS = "-o hard,kill,library";
PRODUCT_BUNDLE_IDENTIFIER = "com.objective-see.lulu.installer";
PRODUCT_NAME = "LuLu Installer";
Expand All @@ -500,7 +496,7 @@
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO;
INFOPLIST_FILE = configure/Info.plist;
LIBRARY_SEARCH_PATHS = "";
MACOSX_DEPLOYMENT_TARGET = 10.10;
MACOSX_DEPLOYMENT_TARGET = 10.12;
OTHER_CODE_SIGN_FLAGS = "-o hard,kill,library";
PRODUCT_BUNDLE_IDENTIFIER = "com.objective-see.lulu.installer";
PRODUCT_NAME = "LuLu Installer";
Expand Down Expand Up @@ -554,7 +550,7 @@
GCC_WARN_UNUSED_LABEL = YES;
GCC_WARN_UNUSED_PARAMETER = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.10;
MACOSX_DEPLOYMENT_TARGET = 10.12;
ONLY_ACTIVE_ARCH = YES;
PROVISIONING_PROFILE = "";
RUN_CLANG_STATIC_ANALYZER = YES;
Expand Down Expand Up @@ -604,7 +600,7 @@
GCC_WARN_UNUSED_LABEL = YES;
GCC_WARN_UNUSED_PARAMETER = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.10;
MACOSX_DEPLOYMENT_TARGET = 10.12;
PROVISIONING_PROFILE = "";
RUN_CLANG_STATIC_ANALYZER = YES;
SDKROOT = macosx;
Expand Down
12 changes: 6 additions & 6 deletions kernelExtension/kernelExtension.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.10;
MACOSX_DEPLOYMENT_TARGET = 10.12;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
Expand Down Expand Up @@ -290,7 +290,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.10;
MACOSX_DEPLOYMENT_TARGET = 10.12;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
};
Expand All @@ -304,9 +304,9 @@
CURRENT_PROJECT_VERSION = 1.0.0;
DEVELOPMENT_TEAM = VBG97UB4TA;
INFOPLIST_FILE = kernelExtension/Info.plist;
MACOSX_DEPLOYMENT_TARGET = 10.10;
MACOSX_DEPLOYMENT_TARGET = 10.12;
MODULE_NAME = "com.objective-see.lulu";
MODULE_VERSION = 1.1.1;
MODULE_VERSION = 1.1.2;
PRODUCT_BUNDLE_IDENTIFIER = "com.objective-see.lulu";
PRODUCT_MODULE_NAME = LuLu;
PRODUCT_NAME = LuLu;
Expand All @@ -322,9 +322,9 @@
CURRENT_PROJECT_VERSION = 1.0.0;
DEVELOPMENT_TEAM = VBG97UB4TA;
INFOPLIST_FILE = kernelExtension/Info.plist;
MACOSX_DEPLOYMENT_TARGET = 10.10;
MACOSX_DEPLOYMENT_TARGET = 10.12;
MODULE_NAME = "com.objective-see.lulu";
MODULE_VERSION = 1.1.1;
MODULE_VERSION = 1.1.2;
PRODUCT_BUNDLE_IDENTIFIER = "com.objective-see.lulu";
PRODUCT_MODULE_NAME = LuLu;
PRODUCT_NAME = LuLu;
Expand Down
4 changes: 2 additions & 2 deletions kernelExtension/kernelExtension/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
<key>CFBundlePackageType</key>
<string>KEXT</string>
<key>CFBundleShortVersionString</key>
<string>1.1.1</string>
<string>1.1.2</string>
<key>CFBundleVersion</key>
<string>1.1.1</string>
<string>1.1.2</string>
<key>IOKitPersonalities</key>
<dict>
<key>Firewall</key>
Expand Down
Loading

0 comments on commit 38bd210

Please sign in to comment.