From c82f23ccaf077dce350292c7f3b2948d61122bbe Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Tue, 20 Jun 2017 03:18:54 -0700 Subject: [pkg] improve Packages script - use relative paths - there's still an absolute path (hardcoded, the REFERENCE FOLDER PATH). This should be changed (sed!) if we want to automate this for CI or for building in different environments: STILL NEEDS SOME MANUAL WORK. - Avoid deleting the build folders by default - Move the plist file to a subfolder --- Makefile | 8 +++---- pkg/osx/installer/Bitmask.pkgproj | 31 ++++++++++++++----------- pkg/osx/installer/post-inst.sh | 5 +--- pkg/osx/installer/se.leap.bitmask-helper.plist | 29 +++++++++++++++++++++++ pkg/osx/se.leap.bitmask-helper.plist | 29 ----------------------- pkg/pyinst/build.mk | 13 ++++++++--- src/leap/bitmask/vpn/helpers/osx/bitmask-helper | 8 +++++-- 7 files changed, 68 insertions(+), 55 deletions(-) create mode 100644 pkg/osx/installer/se.leap.bitmask-helper.plist delete mode 100644 pkg/osx/se.leap.bitmask-helper.plist diff --git a/Makefile b/Makefile index 9b92e412..d4cbc171 100644 --- a/Makefile +++ b/Makefile @@ -4,10 +4,6 @@ DIST_VERSION = dist/bitmask-$(NEXT_VERSION)/ include pkg/pyinst/build.mk include pkg/thirdparty/openvpn/build.mk -clean: - find . -type f -name "*.py[co]" -delete - find . -type d -name "__pycache__" -delete - dev-mail: pip install -e '.[mail]' @@ -64,3 +60,7 @@ bundle_in_docker: docker_container: cd pkg/docker_bundle && docker build -t mybundle . + +clean: + find . -type f -name "*.py[co]" -delete + find . -type d -name "__pycache__" -delete diff --git a/pkg/osx/installer/Bitmask.pkgproj b/pkg/osx/installer/Bitmask.pkgproj index bf882850..f42ffc87 100755 --- a/pkg/osx/installer/Bitmask.pkgproj +++ b/pkg/osx/installer/Bitmask.pkgproj @@ -21,9 +21,9 @@ GID 80 PATH - /Users/user/leap/bitmask_client/dist/Bitmask.app + Bitmask.app PATH_TYPE - 0 + 3 PERMISSIONS 493 TYPE @@ -489,16 +489,16 @@ POSTINSTALL_PATH PATH - ../pkg/osx/post-inst.sh + ../../bitmask-dev/pkg/osx/installer/post-inst.sh PATH_TYPE 3 PREINSTALL_PATH PATH - /Users/user/leap/bitmask_client/pkg/osx/pre-inst.sh + ../pkg/osx/installer/pre-inst.sh PATH_TYPE - 0 + 3 RESOURCES @@ -508,9 +508,9 @@ GID 0 PATH - ../pkg/osx/se.leap.bitmask-helper.plist + se.leap.bitmask-helper.plist PATH_TYPE - 3 + 1 PERMISSIONS 420 TYPE @@ -532,8 +532,10 @@ RELOCATABLE + USE_HFS+_COMPRESSION + VERSION - 0.9.0rc4 + 0.10a1 PROJECT_COMMENTS @@ -548,8 +550,11 @@ dGxlPjwvdGl0bGU+CjxtZXRhIG5hbWU9IkdlbmVyYXRvciIgY29u dGVudD0iQ29jb2EgSFRNTCBXcml0ZXIiPgo8bWV0YSBuYW1lPSJD b2NvYVZlcnNpb24iIGNvbnRlbnQ9IjEyNjUuMjEiPgo8c3R5bGUg - dHlwZT0idGV4dC9jc3MiPgo8L3N0eWxlPgo8L2hlYWQ+Cjxib2R5 - Pgo8L2JvZHk+CjwvaHRtbD4K + dHlwZT0idGV4dC9jc3MiPgpwLnAxIHttYXJnaW46IDAuMHB4IDAu + MHB4IDAuMHB4IDAuMHB4OyBmb250OiAxMi4wcHggSGVsdmV0aWNh + fQo8L3N0eWxlPgo8L2hlYWQ+Cjxib2R5Pgo8cCBjbGFzcz0icDEi + Pk1heSB0aGUgT1NYIGJ1bmRsZXMgYmUgd2l0aCB5b3U8L3A+Cjwv + Ym9keT4KPC9odG1sPgo= PROJECT_SETTINGS @@ -557,9 +562,9 @@ BUILD_PATH PATH - /Users/user/Bitmask/build + ../../../../../Bitmask/build PATH_TYPE - 0 + 1 CERTIFICATE @@ -739,7 +744,7 @@ NAME Bitmask REFERENCE_FOLDER_PATH - /Users/user/leap/bitmask_client/dist + /Users/user/leap/bitmask-dev/dist TYPE diff --git a/pkg/osx/installer/post-inst.sh b/pkg/osx/installer/post-inst.sh index f88ea97a..0202323a 100755 --- a/pkg/osx/installer/post-inst.sh +++ b/pkg/osx/installer/post-inst.sh @@ -1,7 +1,4 @@ #!/bin/sh # Bitmask Post-Instalation script - cp se.leap.bitmask-helper.plist /Library/LaunchDaemons/ -launchctl load /Library/LaunchDaemons/se.leap.bitmask-helper.plist -cp tuntap_20150118.pkg /tmp/ -open /tmp/tuntap_20150118.pkg +launchctl load /Library/LaunchDaemons/se.leap.bitmask-helper.plist || echo "Already loaded, skipping..." diff --git a/pkg/osx/installer/se.leap.bitmask-helper.plist b/pkg/osx/installer/se.leap.bitmask-helper.plist new file mode 100644 index 00000000..4428f131 --- /dev/null +++ b/pkg/osx/installer/se.leap.bitmask-helper.plist @@ -0,0 +1,29 @@ + + + + + StandardOutPath + bitmask-helper.log + StandardErrorPath + bitmask-helper-err.log + GroupName + daemon + KeepAlive + + SuccessfulExit + + + Label + se.leap.bitmask-helper + ProgramArguments + + /Applications/Bitmask.app/Contents/Resources/bitmask-helper/bitmask-helper + + RunAtLoad + + WorkingDirectory + /Applications/Bitmask.app/Contents/Resources/bitmask-helper/ + SessionCreate + + + diff --git a/pkg/osx/se.leap.bitmask-helper.plist b/pkg/osx/se.leap.bitmask-helper.plist deleted file mode 100644 index 4428f131..00000000 --- a/pkg/osx/se.leap.bitmask-helper.plist +++ /dev/null @@ -1,29 +0,0 @@ - - - - - StandardOutPath - bitmask-helper.log - StandardErrorPath - bitmask-helper-err.log - GroupName - daemon - KeepAlive - - SuccessfulExit - - - Label - se.leap.bitmask-helper - ProgramArguments - - /Applications/Bitmask.app/Contents/Resources/bitmask-helper/bitmask-helper - - RunAtLoad - - WorkingDirectory - /Applications/Bitmask.app/Contents/Resources/bitmask-helper/ - SessionCreate - - - diff --git a/pkg/pyinst/build.mk b/pkg/pyinst/build.mk index 86f7c340..448f7e05 100644 --- a/pkg/pyinst/build.mk +++ b/pkg/pyinst/build.mk @@ -1,5 +1,8 @@ # This makefile should be called from the topmost bitmask folder -# + +default: + echo "enter 'make bundle or make bundle_osx'" + bundle: bundle_clean pyinstaller -y pkg/pyinst/app.spec cp $(VIRTUAL_ENV)/lib/python2.7/site-packages/_scrypt.so $(DIST) @@ -37,7 +40,7 @@ bundle_osx_helpers: mkdir -p $(DIST_VERSION)/apps/helpers cp src/leap/bitmask/vpn/helpers/osx/bitmask-helper $(DIST_VERSION)/apps/helpers/ cp src/leap/bitmask/vpn/helpers/osx/bitmask.pf.conf $(DIST_VERSION)/apps/helpers/ - cp pkg/osx/se.leap.bitmask-helper.plist $(DIST_VERSION)/apps/helpers/ + cp pkg/osx/installer/se.leap.bitmask-helper.plist $(DIST_VERSION)/apps/helpers/ cp -r pkg/osx/daemon $(DIST_VERSION)/apps/helpers/ cp -r pkg/osx/openvpn $(DIST_VERSION)/apps/helpers/ @@ -51,6 +54,11 @@ bundle_osx: bundle bundle_osx_helpers cp -r $(DIST_VERSION)/lib/pixelated_www dist/Bitmask.app/Contents/MacOS/ mv dist/Bitmask.app/Contents/MacOS/bitmask dist/Bitmask.app/Contents/MacOS/bitmask-app cp pkg/osx/bitmask-wrapper dist/Bitmask.app/Contents/MacOS/bitmask + mkdir -p dist/Bitmask.app/Contents/Resources/bitmask-helper + cp -r $(DIST_VERSION)/apps/helpers/bitmask-helper dist/Bitmask.app/Contents/Resources/bitmask-helper/ + cp -r $(DIST_VERSION)/apps/helpers/bitmask.pf.conf dist/Bitmask.app/Contents/Resources/bitmask-helper/ + cp -r $(DIST_VERSION)/apps/helpers/daemon/daemon.py dist/Bitmask.app/Contents/Resources/ + cp -r $(DIST_VERSION)/apps/helpers/openvpn/* dist/Bitmask.app/Contents/Resources/ bundle_win: pyinstaller -y pkg/pyinst/app.spec @@ -69,4 +77,3 @@ bundle_upload: bundle_clean: rm -rf "dist" "build" - diff --git a/src/leap/bitmask/vpn/helpers/osx/bitmask-helper b/src/leap/bitmask/vpn/helpers/osx/bitmask-helper index 74f72f7f..7795ba2b 100755 --- a/src/leap/bitmask/vpn/helpers/osx/bitmask-helper +++ b/src/leap/bitmask/vpn/helpers/osx/bitmask-helper @@ -189,7 +189,7 @@ def handle_command(sock): } cmd_call = cmd_dict.get(command, None) - syslog.syslog(syslog.LOG_WARNING, 'call: %s' % (str(cmd_call))) + # syslog.syslog(syslog.LOG_WARNING, 'call: %s' % (str(cmd_call))) try: if cmd_call: syslog.syslog( @@ -248,11 +248,15 @@ def openvpn_start(*args): binary = ['/usr/local/sbin/openvpn'] cmd = binary + opts - # syslog.syslog(syslog.LOG_WARNING, 'LAUNCHING VPN: ' + ' '.join(cmd)) + syslog.syslog(syslog.LOG_WARNING, 'LAUNCHING VPN: ' + ' '.join(cmd)) global openvpn_proc # TODO sanitize options openvpn_proc = subprocess.Popen(cmd, shell=False, bufsize=-1) + # try: + # result = subprocess.check_output(cmd, shell=False, stderr=subprocess.STDOUT) + # except Exception as exc: + # syslog.syslog(syslog.LOG_WARNING, exc.output) def openvpn_stop(sig='TERM'): -- cgit v1.2.3