[pull] 3.0 from jerryma119:3.0

.gitignore

@@ -0,0 +1,10 @@
+.DS_Store
+.appcfg_cookies
+*~
+*.pyc
+*.pac
+*.key
+*.crt
+*.egg
+*.pid
+*.user.ini

README.md

@@ -0,0 +1 @@
+DON'T PANIC

local/CA.crt

@@ -18,3 +18,30 @@ zzFijaXHuObMtd2S292wji79JWocA0z6WVM5Qokw4hRTsXWfXL0BJTL3i/xRrEzW
 sdecYFpNhaEKldjegazoqAqiAMJj7PDU1AqdprNsq+3/tAmCvn0URkas4QhkvtqS
 FO6OGm/PZe5GbkBpAKdfLYFfEMO17SAGHHqAsIKAFfuHYONRGSM=
 -----END CERTIFICATE-----
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAtI1d8sd8hgB5UKs5uH21WrHL058gnbT2q1gZ0J+QN1PaSYyO
+O0gqPI+xX3qGEi9Jh2ydJo2n058Pv3sG9PQECJHRJZ+rJqI5ezTirNWIYdMpXQep
+EFogT6/1yjAbJJr3MoyRKpFOocLYmwEmgGbfquXJUwSdl0WngGjA3g22A3IRWuzE
+zYaEDHUBbtVIapCcbblTARLNf6j28eTvaastUYAHilr8cgs1UYtoR2k57PsHmQSe
+je9Wn8r69XrRqqrVlaY6aG5NWRQWJOMac5wm5uIqjwK/Z6nRg8NSCSHV9A8jCSCa
+6cDn/eKQCvb+sxtI57GzKq6Ji9fJBDF2YGEjJQIDAQABAoIBACB3n2JN/xV1tlsM
+P1fuuxLxD+8hGVNivEy5jgLW/q8EVCePr+/3HSlAyauas8tHV5iTrnrFVF2Yp9NO
+A0U/MA5+cjaqzLMozt9Z9j0QNPMqbrC89Ojs3AyYXsGZ/veJKlSbtGsMMDCkgiD1
+hv/l/+iSY66bEN+n9eQAclY77vQVXLSoCMReVfbdUxU9Q1MywODGf5Kng84gTyT/
+zd+xEfFHz8zbCDyw3Hd3hGJ2FxN+yFz1uI29ORb3/R7N9dZgsWf2fsfiRVPGuhAH
+RNlDockImB+BKeidx14sMim5p7s8heVYkBVW3SIOEReqz59b8x4QVhhZrzYWSHNq
+Gi0pLiECgYEA26v6b+rsxT//PznJSEhLyrg1Jo6XeWmFlwZY0KoipH6sxX/YPrDZ
+bOPN8KvAHtRltRLFs3L2iRaO2jltjxHGVF4FSYrf5KSExuj6/ABHxWM0YtezfDwR
+hU1ORg5QwVegMoOgsphS8ts2xn6T6wIwpBgtFPY84A52IBVn5CHuQtkCgYEA0mk5
+EpnZfmMT5ldcZ7JlZrxfWKvDHIcuA0neIBsd4oIcEfRhDC3TolH6pB4z4SCqyYw3
+t5HMiTx8yz074mycTcOcXO1Cs49kMZwbzKziRXpUdCW4EIo0DG+6LqwetPgYzozg
+FeTiGQBHqjrzjBLZ3RfozICbo7dvYHkVLK92my0CgYBWNBjlDnW3ujN6Jj0cxnIn
+rT3+UXqTxJsN9wmnaPyLPMKkBlVf1JqeJo9MYLnV31fCRQmcMAMbLOUGMf8SY9FG
+jlbY00ylNwJ75DWJ6ro/dXy7RRZELHZbr0iGKVv7Y12UNR88tpXmg6vtHQMC+CsK
+Wgpm7XJaIpKsaHoKhl4vkQKBgBBBTsZwGkxYTSZDY4EjWBAax2brRhSDIPviDgX+
+8k0YbiC493Jga/QjTzC0oJ9ozajqazeETP/hK2bsIR858s1TKlZHghqrHjty6vbh
++E0TyUh7zX+BncnEK+cFJw4mCIyUd49ZcloqGl89VKlin3AkM7jwypVYS4Nxd0BP
+geM1AoGBALOWNmYm9d4gRhUv14oJRiA+e+4evswiWvVdnS6UJ4tst0NlEKWahtpR
+kdAjav8WV1n6IbkJC2L743Ozjb63z5w6p5O7OtTyYUWbLt1hvNkHlkNP8AjRQP8E
++N2jjrMAdbEwahPNAX9QlzHpF62AfEGQ3oODUm06TGTq+yAPSyYm
+-----END RSA PRIVATE KEY-----

local/Microsoft.VC90.CRT.manifest

@@ -1,13 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- Copyright (c) Microsoft Corporation.  All rights reserved. --> 
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-    <noInheritable/>
-    <assemblyIdentity
-        type="win32"
-        name="Microsoft.VC90.CRT"
-        version="9.0.21022.8"
-        processorArchitecture="x86"
-        publicKeyToken="1fc8b3b9a1e18e3b"
-    />  
-    <file name="msvcr90.dll" />
-</assembly>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- Copyright (c) Microsoft Corporation.  All rights reserved. -->
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+    <noInheritable/>
+    <assemblyIdentity type="win32" name="Microsoft.VC90.CRT" version="9.0.21022.8" processorArchitecture="x86" publicKeyToken="1fc8b3b9a1e18e3b" />
+    <file name="msvcr90.dll" />
+</assembly>

local/SwitchyOptions.bak

@@ -0,0 +1 @@
+eyJjb25maWciOiJ7XCJmaXJzdFRpbWVcIjpcIjpdXCIsXCJwcm94eU1vZGVcIjpcImF1dG9cIixcImF1dG9QYWNTY3JpcHRQYXRoXCI6XCI6bWVtb3J5OlwiLFwicnVsZUxpc3RVcmxcIjpcImh0dHA6Ly9hdXRvcHJveHktZ2Z3bGlzdC5nb29nbGVjb2RlLmNvbS9zdm4vdHJ1bmsvZ2Z3bGlzdC50eHRcIixcInJ1bGVMaXN0UmVsb2FkXCI6XCI3MjBcIixcInJ1bGVMaXN0UHJvZmlsZUlkXCI6XCJHb0FnZW50XCIsXCJydWxlTGlzdEF1dG9Qcm94eVwiOnRydWUsXCJzd2l0Y2hSdWxlc1wiOnRydWUsXCJydWxlTGlzdEVuYWJsZWRcIjp0cnVlLFwicGFjU2NyaXB0RGF0YVwiOlwiXCIsXCJwcm94eVNlcnZlclwiOlwiXCIsXCJxdWlja1N3aXRjaFwiOmZhbHNlLFwicXVpY2tTd2l0Y2hUeXBlXCI6XCJiaW5hcnlcIixcInJlYXBwbHlTZWxlY3RlZFByb2ZpbGVcIjp0cnVlLFwiY29uZmlybURlbGV0aW9uXCI6ZmFsc2UsXCJydWxlc0ZpcnN0VGltZVwiOlwiO11cIixcIm1vbml0b3JQcm94eUNoYW5nZXNcIjpmYWxzZSxcInByZXZlbnRQcm94eUNoYW5nZXNcIjpmYWxzZSxcImxhc3RMaXN0VXBkYXRlXCI6XCJTdW4gRGVjIDI5IDIwMTMgMTk6MTQ6NDcgR01UKzA4MDAgKOS4reWbveagh+WHhuaXtumXtClcIixcInJlZnJlc2hUYWJcIjpmYWxzZSxcInN0YXJ0dXBQcm9maWxlSWRcIjpcIlwiLFwicXVpY2tSdWxlUHJvZmlsZUlkXCI6XCJHb0FnZW50XCIsXCJxdWlja1J1bGVQYXR0ZXJuVHlwZVwiOlwid2lsZGNhcmRcIixcInByb3h5Q29uZmlnVXJsXCI6XCI6bWVtb3J5OlwifSIsImRlZmF1bHRSdWxlIjoie1wiaWRcIjpcImRlZmF1bHRSdWxlXCIsXCJuYW1lXCI6XCJEZWZhdWx0IFJ1bGVcIixcInVybFBhdHRlcm5cIjpcIlwiLFwicGF0dGVyblR5cGVcIjpcIndpbGRjYXJkXCIsXCJwcm9maWxlSWRcIjpcImRpcmVjdFwifSIsInByb2ZpbGVzIjoie1wiR29BZ2VudFwiOntcIm5hbWVcIjpcIkdvQWdlbnRcIixcInByb3h5TW9kZVwiOlwibWFudWFsXCIsXCJwcm94eUh0dHBcIjpcIjEyNy4wLjAuMTo4MDg3XCIsXCJ1c2VTYW1lUHJveHlcIjp0cnVlLFwicHJveHlIdHRwc1wiOlwiXCIsXCJwcm94eUZ0cFwiOlwiXCIsXCJwcm94eVNvY2tzXCI6XCJcIixcInNvY2tzVmVyc2lvblwiOjQsXCJwcm94eUV4Y2VwdGlvbnNcIjpcImxvY2FsaG9zdDsgMTI3LjAuMC4xOyA8bG9jYWw+XCIsXCJwcm94eUNvbmZpZ1VybFwiOlwiXCIsXCJjb2xvclwiOlwiYmx1ZVwiLFwiaWRcIjpcIkdvQWdlbnRcIn0sXCJHb0FnZW50IFBIUFwiOntcIm5hbWVcIjpcIkdvQWdlbnQgUEFDXCIsXCJwcm94eU1vZGVcIjpcImF1dG9cIixcInByb3h5SHR0cFwiOlwiXCIsXCJ1c2VTYW1lUHJveHlcIjp0cnVlLFwicHJveHlIdHRwc1wiOlwiXCIsXCJwcm94eUZ0cFwiOlwiXCIsXCJwcm94eVNvY2tzXCI6XCJcIixcInNvY2tzVmVyc2lvblwiOjUsXCJwcm94eUV4Y2VwdGlvbnNcIjpcImxvY2FsaG9zdDsgMTI3LjAuMC4xOyA8bG9jYWw+XCIsXCJwcm94eUNvbmZpZ1VybFwiOlwiaHR0cDovLzEyNy4wLjAuMTo4MDg2L3Byb3h5LnBhY1wiLFwiY29sb3JcIjpcImJsdWVcIixcImlkXCI6XCJHb0FnZW50IFBIUFwifSxcIkdvQWdlbnQgUEhQMlwiOntcIm5hbWVcIjpcIkdvQWdlbnQgUEhQXCIsXCJwcm94eU1vZGVcIjpcIm1hbnVhbFwiLFwicHJveHlIdHRwXCI6XCIxMjcuMC4wLjE6ODA4OFwiLFwidXNlU2FtZVByb3h5XCI6dHJ1ZSxcInByb3h5SHR0cHNcIjpcIlwiLFwicHJveHlGdHBcIjpcIlwiLFwicHJveHlTb2Nrc1wiOlwiXCIsXCJzb2Nrc1ZlcnNpb25cIjo0LFwicHJveHlFeGNlcHRpb25zXCI6XCJsb2NhbGhvc3Q7IDEyNy4wLjAuMTsgPGxvY2FsPlwiLFwicHJveHlDb25maWdVcmxcIjpcIlwiLFwiY29sb3JcIjpcImJsdWVcIixcImlkXCI6XCJHb0FnZW50IFBIUDJcIn19IiwicXVpY2tTd2l0Y2hQcm9maWxlcyI6IltcImRpcmVjdFwiXSIsInJ1bGVzIjoie1wiTmV3IFJ1bGUzXCI6e1wibmFtZVwiOlwiZ29vZ2xlXCIsXCJ1cmxQYXR0ZXJuXCI6XCIqOi8vKi5nb29nbGUuY29tLiovKlwiLFwicGF0dGVyblR5cGVcIjpcIndpbGRjYXJkXCIsXCJwcm9maWxlSWRcIjpcIkdvQWdlbnRcIixcImlkXCI6XCJOZXcgUnVsZTNcIn0sXCJOZXcgUnVsZTJcIjp7XCJuYW1lXCI6XCJnb29nbGVcIixcInVybFBhdHRlcm5cIjpcIio6Ly8qLmdvb2dsZSouY29tLypcIixcInBhdHRlcm5UeXBlXCI6XCJ3aWxkY2FyZFwiLFwicHJvZmlsZUlkXCI6XCJHb0FnZW50XCIsXCJpZFwiOlwiTmV3IFJ1bGUyXCJ9LFwic2ZcIjp7XCJuYW1lXCI6XCJzb3VyY2Vmb3JnZVwiLFwidXJsUGF0dGVyblwiOlwiKjovLyouc291cmNlZm9yZ2UubmV0LypcIixcInBhdHRlcm5UeXBlXCI6XCJ3aWxkY2FyZFwiLFwicHJvZmlsZUlkXCI6XCJHb0FnZW50XCIsXCJpZFwiOlwic2ZcIn0sXCJzZjJcIjp7XCJuYW1lXCI6XCJzb3VyY2Vmb3JnZVwiLFwidXJsUGF0dGVyblwiOlwiKjovLyouc2YubmV0LypcIixcInBhdHRlcm5UeXBlXCI6XCJ3aWxkY2FyZFwiLFwicHJvZmlsZUlkXCI6XCJHb0FnZW50XCIsXCJpZFwiOlwic2YyXCJ9LFwiTmV3IFJ1bGU4XCI6e1wibmFtZVwiOlwid2lraXBlZGlhXCIsXCJ1cmxQYXR0ZXJuXCI6XCIqOi8vKi53aWtpcGVkaWEub3JnLypcIixcInBhdHRlcm5UeXBlXCI6XCJ3aWxkY2FyZFwiLFwicHJvZmlsZUlkXCI6XCJHb0FnZW50XCIsXCJpZFwiOlwiTmV3IFJ1bGU4XCJ9fSIsInNlbGVjdGVkUHJvZmlsZSI6IntcImlkXCI6XCJhdXRvXCIsXCJuYW1lXCI6XCJb6Ieq5Yqo5YiH5o2iXVwiLFwicHJveHlNb2RlXCI6XCJhdXRvXCIsXCJjb2xvclwiOlwiYXV0by1ibHVlXCIsXCJpc0F1dG9tYXRpY01vZGVQcm9maWxlXCI6dHJ1ZSxcInByb3h5Q29uZmlnVXJsXCI6XCI6bWVtb3J5OlwifSJ9

local/addto-startup.py

@@ -0,0 +1,124 @@
+#!/usr/bin/env python
+# coding:utf-8
+
+from __future__ import with_statement
+
+__version__ = '1.0'
+
+import sys
+import os
+import re
+import time
+import ctypes
+import platform
+
+
+def addto_startup_linux():
+    filename = os.path.abspath(__file__)
+    dirname = os.path.dirname(filename)
+    #you can change it to 'proxy.py' if you like :)
+    scriptname = 'goagent-gtk.py'
+    DESKTOP_FILE = '''\
+[Desktop Entry]
+Type=Application
+Categories=Network;Proxy;
+Exec=/usr/bin/env python "%s/%s"
+Icon=%s/goagent-logo.png
+Hidden=false
+NoDisplay=false
+X-GNOME-Autostart-enabled=true
+Name=GoAgent GTK
+Comment=GoAgent GTK Launcher
+''' % (dirname , scriptname , dirname)
+    #sometimes maybe  /etc/xdg/autostart , ~/.kde/Autostart/ , ~/.config/openbox/autostart
+    for dirname in map(os.path.expanduser, ['~/.config/autostart']):
+        if os.path.isdir(dirname):
+            filename = os.path.join(dirname, 'goagent-gtk.desktop')
+            with open(filename, 'w') as fp:
+                fp.write(DESKTOP_FILE)
+           # os.chmod(filename, 0755)
+
+
+def addto_startup_osx():
+    if os.getuid() != 0:
+        print 'please use sudo run this script'
+        sys.exit()
+    import plistlib
+    plist = dict(
+            GroupName = 'wheel',
+            Label = 'org.goagent.macos',
+            ProgramArguments = list([
+                '/usr/bin/python',
+                os.path.join(os.path.abspath(os.path.dirname(__file__)), 'proxy.py')
+                ]),
+            RunAtLoad = True,
+            UserName = 'root',
+            WorkingDirectory = os.path.dirname(__file__),
+            StandardOutPath = '/var/log/goagent.log',
+            StandardErrorPath = '/var/log/goagent.log',
+            KeepAlive = dict(
+                SuccessfulExit = False,
+                )
+            )
+    filename = '/Library/LaunchDaemons/org.goagent.macos.plist'
+    print 'write plist to %s' % filename
+    plistlib.writePlist(plist, filename)
+    print 'write plist to %s done' % filename
+    print 'Adding CA.crt to system keychain, You may need to input your password...'
+    cmd = 'sudo security add-trusted-cert -d -r trustRoot -k "/Library/Keychains/System.keychain" "%s/CA.crt"' % os.path.abspath(os.path.dirname(__file__))
+    if os.system(cmd) != 0:
+        print 'Adding CA.crt to system keychain Failed!'
+        sys.exit(0)
+    print 'Adding CA.crt to system keychain Done'
+    print 'To start goagent right now, try this command: sudo launchctl load /Library/LaunchDaemons/org.goagent.macos.plist'
+    print 'To checkout log file: using Console.app to locate /var/log/goagent.log'
+
+    install_sharp_osx()
+
+
+def install_sharp_osx():
+    # extracted from SwitchySharp.crx
+    extension_id = 'dpplabbmogkhghncfbfdeeokoefdjegm'
+    extension_version = '1.10.2'
+    extension_path = '%s/SwitchySharp.crx' % os.path.abspath(os.path.dirname(__file__))
+
+    dest_path = '/Library/Application Support/Google/Chrome/External Extensions'
+    dest_file = '%s/%s.json' % (dest_path, extension_id)
+    print 'Installing SwitchySharp for Chrome...'
+    cmd = 'mkdir -p "%s"' % dest_path
+    if os.system(cmd) != 0:
+        print 'Create Chrome External Extensions folder Failed!'
+        sys.exit(0)
+
+    json_dict = {'external_crx': extension_path,
+                 'external_version': extension_version}
+    with open(dest_file, 'w') as fp:
+        import json
+        json.dump(json_dict, fp)
+        print 'Installing SwitchySharp done.'
+
+
+def addto_startup_windows():
+    if 1 == ctypes.windll.user32.MessageBoxW(None, u'是否将goagent.exe加入到启动项？', u'GoAgent 对话框', 1):
+        if 1 == ctypes.windll.user32.MessageBoxW(None, u'是否显示托盘区图标？', u'GoAgent 对话框', 1):
+            pass
+
+
+def addto_startup_unknown():
+    print '*** error: Unknown system'
+
+
+def main():
+    addto_startup_funcs = {
+            'Darwin'    : addto_startup_osx,
+            'Windows'   : addto_startup_windows,
+            'Linux'     : addto_startup_linux,
+            }
+    addto_startup_funcs.get(platform.system(), addto_startup_unknown)()
+
+
+if __name__ == '__main__':
+   try:
+       main()
+   except KeyboardInterrupt:
+       pass