xuemingqiang/ShadowsocksX-NG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Extracts obfs-local 0.0.2

Browse Source
This commit is contained in:
Timothy Qiu
2017-11-01 11:23:34 +08:00
committed by Haoyu Qiu
parent f7f7aa0589
commit 234a83f2fa
5 changed files with 60 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ShadowsocksX-NG.xcodeproj/project.pbxproj
View File

@ -8,6 +8,8 @@
/* Begin PBXBuildFile section */
08FCA0FF1E24BE1A0070984F /* example-gui-config.json in Resources */ = {isa = PBXBuildFile; fileRef = 08FCA0FE1E24BE1A0070984F /* example-gui-config.json */; };
1C82DBA81FA96C7500B32551 /* obfs-local in Resources */ = {isa = PBXBuildFile; fileRef = 1C82DBA51FA96C7400B32551 /* obfs-local */; };
1C82DBAA1FA96FB600B32551 /* install_simple_obfs.sh in Resources */ = {isa = PBXBuildFile; fileRef = 1C82DBA91FA96F0300B32551 /* install_simple_obfs.sh */; };
258E511BA910B0521B24DAB8 /* Pods_ShadowsocksX_NG.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 283ED1A8E9B711AC65670031 /* Pods_ShadowsocksX_NG.framework */; };
9B07EFA71D048BBB0052D9DF /* ss-local in Resources */ = {isa = PBXBuildFile; fileRef = 9B07EFA61D048BBB0052D9DF /* ss-local */; };
9B07EFAC1D048E880052D9DF /* menu_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9B07EFA81D048E880052D9DF /* menu_icon@2x.png */; };
@ -136,6 +138,8 @@
/* Begin PBXFileReference section */
08FCA0FE1E24BE1A0070984F /* example-gui-config.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "example-gui-config.json"; sourceTree = "<group>"; };
19083CFCED87354F006967FF /* Pods_ShadowsocksX_NGUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ShadowsocksX_NGUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
1C82DBA51FA96C7400B32551 /* obfs-local */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = "obfs-local"; sourceTree = "<group>"; };
1C82DBA91FA96F0300B32551 /* install_simple_obfs.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = install_simple_obfs.sh; sourceTree = "<group>"; };
1E7783AEDB4A3BDDC9FF16AC /* libPods-proxy_conf_helper.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-proxy_conf_helper.a"; sourceTree = BUILT_PRODUCTS_DIR; };
283ED1A8E9B711AC65670031 /* Pods_ShadowsocksX_NG.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ShadowsocksX_NG.framework; sourceTree = BUILT_PRODUCTS_DIR; };
297AF069022A197FD8E9D226 /* Pods-proxy_conf_helper.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-proxy_conf_helper.release.xcconfig"; path = "Pods/Target Support Files/Pods-proxy_conf_helper/Pods-proxy_conf_helper.release.xcconfig"; sourceTree = "<group>"; };
@ -274,6 +278,15 @@
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
1C82DBA31FA96C7400B32551 /* simple-obfs */ = {
isa = PBXGroup;
children = (
1C82DBA51FA96C7400B32551 /* obfs-local */,
1C82DBA91FA96F0300B32551 /* install_simple_obfs.sh */,
);
path = "simple-obfs";
sourceTree = "<group>";
};
33F4F299F89330966F4526E4 /* Pods */ = {
isa = PBXGroup;
children = (
@ -292,6 +305,7 @@
9B07EFB01D048E900052D9DF /* Support Files */ = {
isa = PBXGroup;
children = (
1C82DBA31FA96C7400B32551 /* simple-obfs */,
9B16E5991F99FD0700E54DC5 /* icons8-Blind Filled-50.png */,
9B16E5971F99FD0700E54DC5 /* icons8-Eye Filled-50.png */,
9B938D931E864B38005F5636 /* menu_g_icon.png */,
@ -588,6 +602,7 @@
files = (
9BBE7B751F508A0E00E8FFE5 /* fix_dir_owner.sh in Resources */,
9B3F7BFF1E82BF5B00C68B75 /* libev.4.dylib in Resources */,
1C82DBAA1FA96FB600B32551 /* install_simple_obfs.sh in Resources */,
9B3F7C001E82BF5B00C68B75 /* libmbedcrypto.2.4.2.dylib in Resources */,
9B3F7C011E82BF5B00C68B75 /* libsodium.18.dylib in Resources */,
9B3F7C021E82BF5B00C68B75 /* libudns.0.dylib in Resources */,
@ -620,6 +635,7 @@
9BAFE2E21E83ED7F00F71CCE /* PreferencesWinController.xib in Resources */,
9B0BFFEB1D0460A70040E62B /* Assets.xcassets in Resources */,
08FCA0FF1E24BE1A0070984F /* example-gui-config.json in Resources */,
1C82DBA81FA96C7500B32551 /* obfs-local in Resources */,
9B938D9D1E864B38005F5636 /* menu_p_icon.png in Resources */,
9B938D9B1E864B38005F5636 /* menu_m_icon.png in Resources */,
9B3FFF271D0898EB0019A709 /* gfwlist.txt in Resources */,
@ -1018,6 +1034,7 @@
"$(inherited)",
"$(SDKROOT)/usr/lib/system",
"$(PROJECT_DIR)/ShadowsocksX-NG",
"$(PROJECT_DIR)/ShadowsocksX-NG/simple-obfs",
);
MACOSX_DEPLOYMENT_TARGET = 10.11;
PRODUCT_BUNDLE_IDENTIFIER = "com.qiuyuzhou.ShadowsocksX-NG";
@ -1047,6 +1064,7 @@
"$(inherited)",
"$(SDKROOT)/usr/lib/system",
"$(PROJECT_DIR)/ShadowsocksX-NG",
"$(PROJECT_DIR)/ShadowsocksX-NG/simple-obfs",
);
MACOSX_DEPLOYMENT_TARGET = 10.11;
PRODUCT_BUNDLE_IDENTIFIER = "com.qiuyuzhou.ShadowsocksX-NG";

1
ShadowsocksX-NG/AppDelegate.swift
View File

@ -82,6 +82,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
InstallSSLocal()
InstallKcptunClient()
InstallPrivoxy()
InstallSimpleObfs()
// Prepare defaults
let defaults = UserDefaults.standard
defaults.register(defaults: [

22
ShadowsocksX-NG/LaunchAgentUtils.swift
View File

@ -11,6 +11,7 @@ import Foundation
let SS_LOCAL_VERSION = "3.0.5"
let KCPTUN_CLIENT_VERSION = "20170322"
let PRIVOXY_VERSION = "3.0.26.static"
let SIMPLE_OBFS_VERSION = "0.0.2"
let APP_SUPPORT_DIR = "/Library/Application Support/ShadowsocksX-NG/"
let LAUNCH_AGENT_DIR = "/Library/LaunchAgents/"
let LAUNCH_AGENT_CONF_SSLOCAL_NAME = "com.qiuyuzhou.shadowsocksX-NG.local.plist"
@ -180,6 +181,27 @@ func SyncSSLocal() {
SyncKcptun()
}
// --------------------------------------------------------------------------------
// MARK: simple-obfs
func InstallSimpleObfs() {
let fileMgr = FileManager.default
let homeDir = NSHomeDirectory()
let appSupportDir = homeDir + APP_SUPPORT_DIR
if !fileMgr.fileExists(atPath: appSupportDir + "simple-obfs-\(SIMPLE_OBFS_VERSION)/obfs-local")
|| !fileMgr.fileExists(atPath: appSupportDir + "plugins/obfs-local") {
let bundle = Bundle.main
let installerPath = bundle.path(forResource: "install_simple_obfs.sh", ofType: nil)
let task = Process.launchedProcess(launchPath: "/bin/sh", arguments: [installerPath!])
task.waitUntilExit()
if task.terminationStatus == 0 {
NSLog("Install simple-obfs succeeded.")
} else {
NSLog("Install simple-obfs failed.")
}
}
}
// --------------------------------------------------------------------------------
// MARK: privoxy

19
ShadowsocksX-NG/simple-obfs/install_simple_obfs.sh Normal file
View File

@ -0,0 +1,19 @@
#!/bin/sh
FILE_DIR=`dirname "${BASH_SOURCE[0]}"`
cd "$FILE_DIR"
NGDir="$HOME/Library/Application Support/ShadowsocksX-NG"
TargetDir="$NGDir/simple-obfs-0.0.2"
PluginDir="$NGDir/plugins"
echo ngdir: ${NGDir}
mkdir -p "$TargetDir"
mkdir -p "$PluginDir"
cp -f obfs-local "$TargetDir"
ln -sfh "$TargetDir/obfs-local" "$PluginDir"
echo done

BIN
ShadowsocksX-NG/simple-obfs/obfs-local Executable file
View File

Binary file not shown.