May 2013 - tor-commits - lists.torproject.org

[flashproxy/master] Send /ip as text/plain.
by dcf＠torproject.org 20 May '13

20 May '13

commit 4dcb05cac85663e3de4f7cd12cb11677a83d3c29 Author: David Fifield <david(a)bamsoftware.com> Date: Sun May 19 19:54:14 2013 -0700 Send /ip as text/plain. --- appengine/fp-reg.go | 1 + 1 file changed, 1 insertion(+) diff --git a/appengine/fp-reg.go b/appengine/fp-reg.go index 9d0850c..a485859 100644 --- a/appengine/fp-reg.go +++ b/appengine/fp-reg.go @@ -16,6 +16,7 @@ func ipHandler(w http.ResponseWriter, r *http.Request) { if net.ParseIP(remoteAddr).To4() == nil { remoteAddr = "[" + remoteAddr + "]" } + w.Header().Set("Content-Type", "text/plain; charset=utf-8") fmt.Fprintf(w, "%s", remoteAddr) }

1 0

[flashproxy/master] Match all URLs in app.yaml.
by dcf＠torproject.org 20 May '13

20 May '13

commit 8fe127f359d8c15aff97db0bd56820c05556b62e Author: David Fifield <david(a)bamsoftware.com> Date: Sun May 19 23:48:10 2013 -0700 Match all URLs in app.yaml. Let the app take care of what gets run for each. --- appengine/app.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appengine/app.yaml b/appengine/app.yaml index 6b7bd08..3b99ada 100644 --- a/appengine/app.yaml +++ b/appengine/app.yaml @@ -4,6 +4,6 @@ runtime: go api_version: go1 handlers: -- url: /(ip|reg/.+) +- url: /.* script: _go_app secure: always

1 0

[flashproxy/master] Handle robots.txt.
by dcf＠torproject.org 20 May '13

20 May '13

commit 146a0662ab689472de8600bc0585ee04271be547 Author: David Fifield <david(a)bamsoftware.com> Date: Sun May 19 23:48:46 2013 -0700 Handle robots.txt. --- appengine/fp-reg.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/appengine/fp-reg.go b/appengine/fp-reg.go index 107ec87..2ba6f10 100644 --- a/appengine/fp-reg.go +++ b/appengine/fp-reg.go @@ -10,6 +10,11 @@ import ( const BASE = "https://fp-facilitator.org/reg/" +func robotsTxtHandler(w http.ResponseWriter, r *http.Request) { + w.Header().Set("Content-Type", "text/plain; charset=utf-8") + w.Write([]byte("User-agent: *\nDisallow:\n")) +} + func ipHandler(w http.ResponseWriter, r *http.Request) { remoteAddr := r.RemoteAddr if net.ParseIP(remoteAddr).To4() == nil { @@ -32,6 +37,7 @@ func regHandler(w http.ResponseWriter, r *http.Request) { } func init() { + http.HandleFunc("/robots.txt", robotsTxtHandler) http.HandleFunc("/ip", ipHandler) http.HandleFunc("/reg/", regHandler) }

1 0

[flashproxy/master] No need for fmt.
by dcf＠torproject.org 20 May '13

20 May '13

commit 96ad192010e465a34ffd30707d0e554308ac9d9b Author: David Fifield <david(a)bamsoftware.com> Date: Sun May 19 19:55:55 2013 -0700 No need for fmt. --- appengine/fp-reg.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/appengine/fp-reg.go b/appengine/fp-reg.go index a485859..107ec87 100644 --- a/appengine/fp-reg.go +++ b/appengine/fp-reg.go @@ -1,7 +1,6 @@ package fp_reg import ( - "fmt" "net" "net/http" @@ -17,7 +16,7 @@ func ipHandler(w http.ResponseWriter, r *http.Request) { remoteAddr = "[" + remoteAddr + "]" } w.Header().Set("Content-Type", "text/plain; charset=utf-8") - fmt.Fprintf(w, "%s", remoteAddr) + w.Write([]byte(remoteAddr)) } func regHandler(w http.ResponseWriter, r *http.Request) { @@ -29,7 +28,7 @@ func regHandler(w http.ResponseWriter, r *http.Request) { http.Error(w, err.Error(), http.StatusInternalServerError) return } - fmt.Fprintf(w, "Thanks.") + w.Write([]byte("Thanks.")) } func init() {

1 0

[flashproxy/master] Shorter.
by dcf＠torproject.org 20 May '13

20 May '13

commit 49300098c80c6267f351fcad58ca7d5e8919ddd9 Author: David Fifield <david(a)bamsoftware.com> Date: Mon May 20 00:26:53 2013 -0700 Shorter. --- appengine/fp-reg.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/appengine/fp-reg.go b/appengine/fp-reg.go index cb0fa04..6e55528 100644 --- a/appengine/fp-reg.go +++ b/appengine/fp-reg.go @@ -31,9 +31,8 @@ func regHandler(w http.ResponseWriter, r *http.Request) { http.NotFound(w, r) return } - c := appengine.NewContext(r) - client := urlfetch.Client(c) - _, err := client.Get(BASE + blob) + client := urlfetch.Client(appengine.NewContext(r)) + resp, err := client.Get(BASE + blob) if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) return

1 0

[flashproxy/master] Change app name flashproxy-reg → fp-reg-a.
by dcf＠torproject.org 20 May '13

20 May '13

commit b1fb71508c1a2956dc513e84f8d3cd27a345abff Author: David Fifield <david(a)bamsoftware.com> Date: Sun May 19 19:38:58 2013 -0700 Change app name flashproxy-reg → fp-reg-a. --- appengine/app.yaml | 2 +- flashproxy-reg-appspot | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/appengine/app.yaml b/appengine/app.yaml index fa86e75..6b7bd08 100644 --- a/appengine/app.yaml +++ b/appengine/app.yaml @@ -1,4 +1,4 @@ -application: flashproxy-reg +application: fp-reg-a version: 1 runtime: go api_version: go1 diff --git a/flashproxy-reg-appspot b/flashproxy-reg-appspot index b861867..c086e06 100755 --- a/flashproxy-reg-appspot +++ b/flashproxy-reg-appspot @@ -26,7 +26,7 @@ DEFAULT_REMOTE_PORT = 9000 # The domain to which requests appear to go. FRONT_DOMAIN = "www.google.com" # The value of the Host header within requests. -TARGET_DOMAIN = "flashproxy-reg.appspot.com" +TARGET_DOMAIN = "fp-reg-a.appspot.com" FLASHPROXY_REG_URL = "flashproxy-reg-url"

1 0

[flashproxy/master] Move fp.go → fp-reg.go
by dcf＠torproject.org 20 May '13

20 May '13

commit bed066b860d14ac16a9bfb6323d21cf40660a45d Author: David Fifield <david(a)bamsoftware.com> Date: Sun May 19 19:38:34 2013 -0700 Move fp.go → fp-reg.go --- appengine/fp-reg.go | 37 +++++++++++++++++++++++++++++++++++++ appengine/fp.go | 37 ------------------------------------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/appengine/fp-reg.go b/appengine/fp-reg.go new file mode 100644 index 0000000..9d0850c --- /dev/null +++ b/appengine/fp-reg.go @@ -0,0 +1,37 @@ +package fp_reg + +import ( + "fmt" + "net" + "net/http" + + "appengine" + "appengine/urlfetch" +) + +const BASE = "https://fp-facilitator.org/reg/" + +func ipHandler(w http.ResponseWriter, r *http.Request) { + remoteAddr := r.RemoteAddr + if net.ParseIP(remoteAddr).To4() == nil { + remoteAddr = "[" + remoteAddr + "]" + } + fmt.Fprintf(w, "%s", remoteAddr) +} + +func regHandler(w http.ResponseWriter, r *http.Request) { + c := appengine.NewContext(r) + blob := r.URL.Path[5:] + client := urlfetch.Client(c) + _, err := client.Get(BASE + blob) + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + fmt.Fprintf(w, "Thanks.") +} + +func init() { + http.HandleFunc("/ip", ipHandler) + http.HandleFunc("/reg/", regHandler) +} diff --git a/appengine/fp.go b/appengine/fp.go deleted file mode 100644 index 93465c3..0000000 --- a/appengine/fp.go +++ /dev/null @@ -1,37 +0,0 @@ -package fp - -import ( - "fmt" - "net" - "net/http" - - "appengine" - "appengine/urlfetch" -) - -const BASE = "https://fp-facilitator.org/reg/" - -func ipHandler(w http.ResponseWriter, r *http.Request) { - remoteAddr := r.RemoteAddr - if net.ParseIP(remoteAddr).To4() == nil { - remoteAddr = "[" + remoteAddr + "]" - } - fmt.Fprintf(w, "%s", remoteAddr) -} - -func regHandler(w http.ResponseWriter, r *http.Request) { - c := appengine.NewContext(r) - blob := r.URL.Path[5:] - client := urlfetch.Client(c) - _, err := client.Get(BASE + blob) - if err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) - return - } - fmt.Fprintf(w, "Thanks.") -} - -func init() { - http.HandleFunc("/ip", ipHandler) - http.HandleFunc("/reg/", regHandler) -}

1 0

[flashproxy/master] Add App Engine howto.
by dcf＠torproject.org 20 May '13

20 May '13

commit 5643376fd56bd0b7ff76fbd02c7d80a4367e26af Author: David Fifield <david(a)bamsoftware.com> Date: Sun May 19 18:15:57 2013 -0700 Add App Engine howto. --- doc/appengine-howto.txt | 51 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/doc/appengine-howto.txt b/doc/appengine-howto.txt new file mode 100644 index 0000000..3fc9e9f --- /dev/null +++ b/doc/appengine-howto.txt @@ -0,0 +1,51 @@ +These are instructions for how to set up a Google App Engine application +to run at appspot.com. + +General links: +https://developers.google.com/appengine/ +https://developers.google.com/appengine/docs/whatisgoogleappengine +https://developers.google.com/appengine/docs/go/gettingstarted/ + +You first need to create a Google account. See gmail-howto.txt for how +to do that. + +Download the SDK: +https://developers.google.com/appengine/docs/go/gettingstarted/devenvironment + +Write your program and app.yaml file: +https://developers.google.com/appengine/docs/go/gettingstarted/helloworld + +When you're ready to upload, log in with your Google account and follow +the directions: +https://appengine.google.com/ +https://developers.google.com/appengine/docs/go/gettingstarted/uploading + +Enter an application ID and create the application. + +Use the appcfg.py program to upload the program. It should look +something like this: + +$ torify ./google_appengine/appcfg.py update myapp/ +07:25 PM Host: appengine.google.com +07:25 PM Application: application-id; version: 1 +07:25 PM +Starting update of app: application-id, version: 1 +07:25 PM Getting current resource limits. +Email: xxx(a)gmail.com +Password for xxx(a)gmail.com: +07:26 PM Scanning files on local disk. +07:26 PM Cloning 2 application files. +07:26 PM Uploading 1 files and blobs. +07:26 PM Uploaded 1 files and blobs +07:26 PM Compilation starting. +07:26 PM Compilation: 1 files left. +07:26 PM Compilation completed. +07:26 PM Starting deployment. +07:26 PM Checking if deployment succeeded. +07:26 PM Deployment successful. +07:26 PM Checking if updated app version is serving. +07:26 PM Completed update of app: application-id, version: 1 + +Uploading the program in this way seems to create the files +~/.appcfg_nag and ~/.appcfg_cookies. Running the update command again +doesn't require you to enter your password again.

1 0

[flashproxy/master] How to disable logs in App Engine.
by dcf＠torproject.org 20 May '13

20 May '13

commit 1d4a43e2e3b08e635f49f72fb0f6ac6de49c62b7 Author: David Fifield <david(a)bamsoftware.com> Date: Sun May 19 19:36:24 2013 -0700 How to disable logs in App Engine. --- doc/appengine-howto.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/appengine-howto.txt b/doc/appengine-howto.txt index 3fc9e9f..44c5324 100644 --- a/doc/appengine-howto.txt +++ b/doc/appengine-howto.txt @@ -49,3 +49,8 @@ Password for xxx(a)gmail.com: Uploading the program in this way seems to create the files ~/.appcfg_nag and ~/.appcfg_cookies. Running the update command again doesn't require you to enter your password again. + +Once logged in, you can disable logging for the application. Click +"Logs" on the left panel. Under "Total Logs Storage", click "Change +Settings". Enter "0" in the "days of logs" box and click "Save +Settings".

1 0

[flashproxy/master] Move appspot → appengine.
by dcf＠torproject.org 20 May '13

20 May '13

commit cee3dd3448edff1ceac3b263de8b753717f9bf1b Author: David Fifield <david(a)bamsoftware.com> Date: Sun May 19 19:33:00 2013 -0700 Move appspot → appengine. --- appengine/app.yaml | 9 +++++++++ appengine/fp.go | 37 +++++++++++++++++++++++++++++++++++++ appspot/app.yaml | 9 --------- appspot/fp.go | 37 ------------------------------------- 4 files changed, 46 insertions(+), 46 deletions(-) diff --git a/appengine/app.yaml b/appengine/app.yaml new file mode 100644 index 0000000..fa86e75 --- /dev/null +++ b/appengine/app.yaml @@ -0,0 +1,9 @@ +application: flashproxy-reg +version: 1 +runtime: go +api_version: go1 + +handlers: +- url: /(ip|reg/.+) + script: _go_app + secure: always diff --git a/appengine/fp.go b/appengine/fp.go new file mode 100644 index 0000000..93465c3 --- /dev/null +++ b/appengine/fp.go @@ -0,0 +1,37 @@ +package fp + +import ( + "fmt" + "net" + "net/http" + + "appengine" + "appengine/urlfetch" +) + +const BASE = "https://fp-facilitator.org/reg/" + +func ipHandler(w http.ResponseWriter, r *http.Request) { + remoteAddr := r.RemoteAddr + if net.ParseIP(remoteAddr).To4() == nil { + remoteAddr = "[" + remoteAddr + "]" + } + fmt.Fprintf(w, "%s", remoteAddr) +} + +func regHandler(w http.ResponseWriter, r *http.Request) { + c := appengine.NewContext(r) + blob := r.URL.Path[5:] + client := urlfetch.Client(c) + _, err := client.Get(BASE + blob) + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + fmt.Fprintf(w, "Thanks.") +} + +func init() { + http.HandleFunc("/ip", ipHandler) + http.HandleFunc("/reg/", regHandler) +} diff --git a/appspot/app.yaml b/appspot/app.yaml deleted file mode 100644 index fa86e75..0000000 --- a/appspot/app.yaml +++ /dev/null @@ -1,9 +0,0 @@ -application: flashproxy-reg -version: 1 -runtime: go -api_version: go1 - -handlers: -- url: /(ip|reg/.+) - script: _go_app - secure: always diff --git a/appspot/fp.go b/appspot/fp.go deleted file mode 100644 index 93465c3..0000000 --- a/appspot/fp.go +++ /dev/null @@ -1,37 +0,0 @@ -package fp - -import ( - "fmt" - "net" - "net/http" - - "appengine" - "appengine/urlfetch" -) - -const BASE = "https://fp-facilitator.org/reg/" - -func ipHandler(w http.ResponseWriter, r *http.Request) { - remoteAddr := r.RemoteAddr - if net.ParseIP(remoteAddr).To4() == nil { - remoteAddr = "[" + remoteAddr + "]" - } - fmt.Fprintf(w, "%s", remoteAddr) -} - -func regHandler(w http.ResponseWriter, r *http.Request) { - c := appengine.NewContext(r) - blob := r.URL.Path[5:] - client := urlfetch.Client(c) - _, err := client.Get(BASE + blob) - if err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) - return - } - fmt.Fprintf(w, "Thanks.") -} - -func init() { - http.HandleFunc("/ip", ipHandler) - http.HandleFunc("/reg/", regHandler) -}

1 0