update from origin

README.md

@@ -0,0 +1,24 @@
+goagent 3.2.3 [http://git.io/goa](https://nodeload.github.com/goagent/goagent/legacy.zip/3.0)
+
+## Issues
+* https://code.google.com/p/goagent/issues/list
+
+## Documents
+|    |   |
+| --------   | :----  |
+| Simple Guide | https://github.com/goagent/goagent/blob/wiki/SimpleGuide.md |
+| Graphic Guide | https://github.com/goagent/goagent/blob/wiki/InstallGuide.md |
+| FAQ | https://github.com/goagent/goagent/blob/wiki/FAQ.md |
+| Configurations | https://github.com/goagent/goagent/blob/wiki/ConfigIntroduce.md.ini |
+| Spam List | https://github.com/goagent/goagent/blob/wiki/SpamList.md |
+| History | https://github.com/goagent/goagent/blob/wiki/History.md |
+
+## Code
+| | |
+| --------   | :----  |
+| proxy.py | https://github.com/goagent/goagent |
+| python27.exe | https://github.com/goagent/pybuild |
+| goagent.exe | https://github.com/goagent/taskbar |
+
+## License
+ * [GNU GPL v2](http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)

local/.gitignore

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

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 @@
+eyJjb25maWciOiJ7XCJmaXJzdFRpbWVcIjpcIjpdXCIsXCJwcm94eU1vZGVcIjpcImF1dG9cIixcImF1dG9QYWNTY3JpcHRQYXRoXCI6XCI6bWVtb3J5OlwiLFwicnVsZUxpc3RVcmxcIjpcImh0dHBzOi8vYXV0b3Byb3h5LWdmd2xpc3QuZ29vZ2xlY29kZS5jb20vc3ZuL3RydW5rL2dmd2xpc3QudHh0XCIsXCJydWxlTGlzdFJlbG9hZFwiOlwiNzIwXCIsXCJydWxlTGlzdFByb2ZpbGVJZFwiOlwiR29BZ2VudFwiLFwicnVsZUxpc3RBdXRvUHJveHlcIjp0cnVlLFwic3dpdGNoUnVsZXNcIjp0cnVlLFwicnVsZUxpc3RFbmFibGVkXCI6dHJ1ZSxcInBhY1NjcmlwdERhdGFcIjpcIlwiLFwicHJveHlTZXJ2ZXJcIjpcIlwiLFwicXVpY2tTd2l0Y2hcIjpmYWxzZSxcInF1aWNrU3dpdGNoVHlwZVwiOlwiYmluYXJ5XCIsXCJyZWFwcGx5U2VsZWN0ZWRQcm9maWxlXCI6dHJ1ZSxcImNvbmZpcm1EZWxldGlvblwiOmZhbHNlLFwicnVsZXNGaXJzdFRpbWVcIjpcIjtdXCIsXCJtb25pdG9yUHJveHlDaGFuZ2VzXCI6ZmFsc2UsXCJwcmV2ZW50UHJveHlDaGFuZ2VzXCI6ZmFsc2UsXCJsYXN0TGlzdFVwZGF0ZVwiOlwiVGh1IFNlcCAxMSAyMDE0IDE2OjE2OjMxIEdNVCswODAwIChDaGluYSBTdGFuZGFyZCBUaW1lKVwiLFwicmVmcmVzaFRhYlwiOmZhbHNlLFwic3RhcnR1cFByb2ZpbGVJZFwiOlwiXCIsXCJxdWlja1J1bGVQcm9maWxlSWRcIjpcIkdvQWdlbnRcIixcInF1aWNrUnVsZVBhdHRlcm5UeXBlXCI6XCJ3aWxkY2FyZFwiLFwicHJveHlDb25maWdVcmxcIjpcIjptZW1vcnk6XCJ9IiwiZGVmYXVsdFJ1bGUiOiJ7XCJpZFwiOlwiZGVmYXVsdFJ1bGVcIixcIm5hbWVcIjpcIkRlZmF1bHQgUnVsZVwiLFwidXJsUGF0dGVyblwiOlwiXCIsXCJwYXR0ZXJuVHlwZVwiOlwid2lsZGNhcmRcIixcInByb2ZpbGVJZFwiOlwiZGlyZWN0XCJ9IiwicHJvZmlsZXMiOiJ7XCJHb0FnZW50XCI6e1wibmFtZVwiOlwiR29BZ2VudFwiLFwicHJveHlNb2RlXCI6XCJtYW51YWxcIixcInByb3h5SHR0cFwiOlwiMTI3LjAuMC4xOjgwODdcIixcInVzZVNhbWVQcm94eVwiOnRydWUsXCJwcm94eUh0dHBzXCI6XCJcIixcInByb3h5RnRwXCI6XCJcIixcInByb3h5U29ja3NcIjpcIlwiLFwic29ja3NWZXJzaW9uXCI6NCxcInByb3h5RXhjZXB0aW9uc1wiOlwibG9jYWxob3N0OyAxMjcuMC4wLjE7IDxsb2NhbD5cIixcInByb3h5Q29uZmlnVXJsXCI6XCJcIixcImNvbG9yXCI6XCJibHVlXCIsXCJpZFwiOlwiR29BZ2VudFwifSxcIkdvQWdlbnQgUEhQXCI6e1wibmFtZVwiOlwiR29BZ2VudCBQQUNcIixcInByb3h5TW9kZVwiOlwiYXV0b1wiLFwicHJveHlIdHRwXCI6XCJcIixcInVzZVNhbWVQcm94eVwiOnRydWUsXCJwcm94eUh0dHBzXCI6XCJcIixcInByb3h5RnRwXCI6XCJcIixcInByb3h5U29ja3NcIjpcIlwiLFwic29ja3NWZXJzaW9uXCI6NSxcInByb3h5RXhjZXB0aW9uc1wiOlwibG9jYWxob3N0OyAxMjcuMC4wLjE7IDxsb2NhbD5cIixcInByb3h5Q29uZmlnVXJsXCI6XCJodHRwOi8vMTI3LjAuMC4xOjgwODYvcHJveHkucGFjXCIsXCJjb2xvclwiOlwiYmx1ZVwiLFwiaWRcIjpcIkdvQWdlbnQgUEhQXCJ9LFwiR29BZ2VudCBQSFAyXCI6e1wibmFtZVwiOlwiR29BZ2VudCBQSFBcIixcInByb3h5TW9kZVwiOlwibWFudWFsXCIsXCJwcm94eUh0dHBcIjpcIjEyNy4wLjAuMTo4MDg4XCIsXCJ1c2VTYW1lUHJveHlcIjp0cnVlLFwicHJveHlIdHRwc1wiOlwiXCIsXCJwcm94eUZ0cFwiOlwiXCIsXCJwcm94eVNvY2tzXCI6XCJcIixcInNvY2tzVmVyc2lvblwiOjQsXCJwcm94eUV4Y2VwdGlvbnNcIjpcImxvY2FsaG9zdDsgMTI3LjAuMC4xOyA8bG9jYWw+XCIsXCJwcm94eUNvbmZpZ1VybFwiOlwiXCIsXCJjb2xvclwiOlwiYmx1ZVwiLFwiaWRcIjpcIkdvQWdlbnQgUEhQMlwifX0iLCJxdWlja1N3aXRjaFByb2ZpbGVzIjoiW1wiZGlyZWN0XCJdIiwicnVsZXMiOiJ7XCJnZ3BodFwiOntcIm5hbWVcIjpcImdncGh0XCIsXCJ1cmxQYXR0ZXJuXCI6XCIqOi8vKi5nZ3BodC5jb20vKlwiLFwicGF0dGVyblR5cGVcIjpcIndpbGRjYXJkXCIsXCJwcm9maWxlSWRcIjpcIkdvQWdlbnRcIixcImlkXCI6XCJnZ3BodFwifSxcIk5ldyBSdWxlM1wiOntcIm5hbWVcIjpcImdvb2dsZVwiLFwidXJsUGF0dGVyblwiOlwiKjovLyouZ29vZ2xlLmNvbS4qLypcIixcInBhdHRlcm5UeXBlXCI6XCJ3aWxkY2FyZFwiLFwicHJvZmlsZUlkXCI6XCJHb0FnZW50XCIsXCJpZFwiOlwiTmV3IFJ1bGUzXCJ9LFwiTmV3IFJ1bGUyXCI6e1wibmFtZVwiOlwiZ29vZ2xlXCIsXCJ1cmxQYXR0ZXJuXCI6XCIqOi8vKi5nb29nbGUqLmNvbS8qXCIsXCJwYXR0ZXJuVHlwZVwiOlwid2lsZGNhcmRcIixcInByb2ZpbGVJZFwiOlwiR29BZ2VudFwiLFwiaWRcIjpcIk5ldyBSdWxlMlwifSxcIk5ldyBSdWxlOFwiOntcIm5hbWVcIjpcIndpa2lwZWRpYVwiLFwidXJsUGF0dGVyblwiOlwiKjovLyoud2lraXBlZGlhLm9yZy8qXCIsXCJwYXR0ZXJuVHlwZVwiOlwid2lsZGNhcmRcIixcInByb2ZpbGVJZFwiOlwiR29BZ2VudFwiLFwiaWRcIjpcIk5ldyBSdWxlOFwifX0iLCJzZWxlY3RlZFByb2ZpbGUiOiJ7XCJpZFwiOlwiYXV0b1wiLFwibmFtZVwiOlwiW0F1dG8gU3dpdGNoXVwiLFwicHJveHlNb2RlXCI6XCJhdXRvXCIsXCJjb2xvclwiOlwiYXV0by1ibHVlXCIsXCJpc0F1dG9tYXRpY01vZGVQcm9maWxlXCI6dHJ1ZSxcInByb3h5Q29uZmlnVXJsXCI6XCI6bWVtb3J5OlwifSJ9

local/addto-startup.py

@@ -0,0 +1,127 @@
+#!/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
+
+python2 = os.popen('python2 -V 2>&1').read().startswith('Python 2.') and 'python2' or 'python'
+
+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 %s "%s/%s"
+Icon=%s/goagent-logo.png
+Hidden=false
+NoDisplay=false
+X-GNOME-Autostart-enabled=true
+Name=GoAgent GTK
+Comment=GoAgent GTK Launcher
+''' % (python2, dirname , scriptname , dirname)
+    #sometimes maybe  /etc/xdg/autostart , ~/.kde/Autostart/ , ~/.config/openbox/autostart
+    for dirname in map(os.path.expanduser, ['~/.config/autostart']):
+        if not os.path.exists(dirname):
+            os.makedirs(dirname)
+        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/%s' % python2,
+                os.path.join(os.path.abspath(os.path.dirname(__file__)), 'proxy.py')
+                ]),
+            RunAtLoad = True,
+            UserName = 'root',
+            WorkingDirectory = os.path.abspath(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