April 2019 - tor-commits - lists.torproject.org

[tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0
by nickm＠torproject.org 11 Apr '19

11 Apr '19

commit 5ae1389465f9be45530c8e07f7870e021705fe31 Merge: dac18e0b2 40471d73e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 11 17:06:26 2019 -0400 Merge branch 'maint-0.4.0' into release-0.4.0 configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)

1 0

[webwml/master] alpha version is now 0.4.0.4-rc
by nickm＠torproject.org 11 Apr '19

11 Apr '19

commit 5378a52ac0220f996108e24e4fa0ef59b9c30eaf Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 11 17:04:56 2019 -0400 alpha version is now 0.4.0.4-rc --- Makefile | 2 +- include/versions.wmi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 304cf889..9fa032ef 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ # website component, and set it to needs_review. export STABLETAG=tor-0.3.5.8 -export DEVTAG=tor-0.4.0.3-alpha +export DEVTAG=tor-0.4.0.4-rc WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate docs/torbutton diff --git a/include/versions.wmi b/include/versions.wmi index e13274d8..5fcea797 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -1,5 +1,5 @@ <define-tag version-stable whitespace=delete>0.3.5.8</define-tag> -<define-tag version-alpha whitespace=delete>0.4.0.3-alpha</define-tag> +<define-tag version-alpha whitespace=delete>0.4.0.4-rc</define-tag> <define-tag version-torbrowserdevelopbranch whitespace=delete>maint-8.0</define-tag>

1 0

[translation/tpo-web_completed] Update translations for tpo-web_completed
by translation＠torproject.org 11 Apr '19

11 Apr '19

commit e09f60938f8d7f094ff69c744e987a257bccfee3 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 11 19:50:52 2019 +0000 Update translations for tpo-web_completed --- contents+tr.po | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/contents+tr.po b/contents+tr.po index d3479e6a3..3680dcbac 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -2,6 +2,7 @@ # erinm, 2019 # Emma Peel, 2019 # Kaya Zeren <kayazeren(a)gmail.com>, 2019 +# Arda Büyükkaya <ardabuyukkaya(a)protonmail.com>, 2019 # msgid "" msgstr "" @@ -9,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-04-06 10:26+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: Kaya Zeren <kayazeren(a)gmail.com>, 2019\n" +"Last-Translator: Arda Büyükkaya <ardabuyukkaya(a)protonmail.com>, 2019\n" "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -975,6 +976,8 @@ msgid "" "At the moment, we don't have any official open positions. Please check back " "soon, though!" msgstr "" +"Şu anda herhangi bir resmi açık pozisyonumuz yok. Lütfen kısa süre sonra " +"tekrar kontrol edin!" #: templates/jobs.html:18 templates/projects.html:5 msgid "Previous Openings"

1 0

[translation/tpo-web] Update translations for tpo-web
by translation＠torproject.org 11 Apr '19

11 Apr '19

commit 16f0a44c506d40c709ff6a437500ea195c7b00d6 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 11 19:50:47 2019 +0000 Update translations for tpo-web --- contents+tr.po | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/contents+tr.po b/contents+tr.po index d3479e6a3..3680dcbac 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -2,6 +2,7 @@ # erinm, 2019 # Emma Peel, 2019 # Kaya Zeren <kayazeren(a)gmail.com>, 2019 +# Arda Büyükkaya <ardabuyukkaya(a)protonmail.com>, 2019 # msgid "" msgstr "" @@ -9,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-04-06 10:26+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: Kaya Zeren <kayazeren(a)gmail.com>, 2019\n" +"Last-Translator: Arda Büyükkaya <ardabuyukkaya(a)protonmail.com>, 2019\n" "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -975,6 +976,8 @@ msgid "" "At the moment, we don't have any official open positions. Please check back " "soon, though!" msgstr "" +"Şu anda herhangi bir resmi açık pozisyonumuz yok. Lütfen kısa süre sonra " +"tekrar kontrol edin!" #: templates/jobs.html:18 templates/projects.html:5 msgid "Previous Openings"

1 0

[translation/torbutton-browseronboardingproperties_completed] Update translations for torbutton-browseronboardingproperties_completed
by translation＠torproject.org 11 Apr '19

11 Apr '19

commit b64926926792c0ef0fa37422ec94e9e903a00157 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 11 19:49:56 2019 +0000 Update translations for torbutton-browseronboardingproperties_completed --- tr/browserOnboarding.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tr/browserOnboarding.properties b/tr/browserOnboarding.properties index 3df73bcac..0355a2a83 100644 --- a/tr/browserOnboarding.properties +++ b/tr/browserOnboarding.properties @@ -26,7 +26,7 @@ onboarding.tour-tor-circuit-display.next-button=Güvenlik onboarding.tour-tor-security=Güvenlik onboarding.tour-tor-security.title=Deneyiminizi özelleştirin. onboarding.tour-tor-security.description=Ek ayarları kullanarak web tarayıcınızın güvenliğini arttırabilirsiniz. Güvenlik Düzeyi Ayarı bilgisayarınıza saldırmak için kullanılabilecek bileşenleri engellemenizi sağlar. Seçeneklerinizi görebilmek için aşağıya tıklayın. -onboarding.tour-tor-security.description-suffix=Note: By default, NoScript and HTTPS Everywhere are not included on the toolbar, but you can customize your toolbar to add them. +onboarding.tour-tor-security.description-suffix=Not: Varsayılan olarak, NoScript ve HTTPS Everywhere araç çubuğuna dahil edilmez, ancak araç çubuğunu eklemek için özelleştirebilirsiniz. onboarding.tour-tor-security-level.button=Güvenlik Düzeyinize Bakın onboarding.tour-tor-security-level.next-button=Deneyim İpuçları

1 0

[translation/torbutton-browseronboardingproperties] Update translations for torbutton-browseronboardingproperties
by translation＠torproject.org 11 Apr '19

11 Apr '19

commit afa4bb28691855c909295cd8686083c9386aa708 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 11 19:49:49 2019 +0000 Update translations for torbutton-browseronboardingproperties --- tr/browserOnboarding.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tr/browserOnboarding.properties b/tr/browserOnboarding.properties index 3df73bcac..0355a2a83 100644 --- a/tr/browserOnboarding.properties +++ b/tr/browserOnboarding.properties @@ -26,7 +26,7 @@ onboarding.tour-tor-circuit-display.next-button=Güvenlik onboarding.tour-tor-security=Güvenlik onboarding.tour-tor-security.title=Deneyiminizi özelleştirin. onboarding.tour-tor-security.description=Ek ayarları kullanarak web tarayıcınızın güvenliğini arttırabilirsiniz. Güvenlik Düzeyi Ayarı bilgisayarınıza saldırmak için kullanılabilecek bileşenleri engellemenizi sağlar. Seçeneklerinizi görebilmek için aşağıya tıklayın. -onboarding.tour-tor-security.description-suffix=Note: By default, NoScript and HTTPS Everywhere are not included on the toolbar, but you can customize your toolbar to add them. +onboarding.tour-tor-security.description-suffix=Not: Varsayılan olarak, NoScript ve HTTPS Everywhere araç çubuğuna dahil edilmez, ancak araç çubuğunu eklemek için özelleştirebilirsiniz. onboarding.tour-tor-security-level.button=Güvenlik Düzeyinize Bakın onboarding.tour-tor-security-level.next-button=Deneyim İpuçları

1 0

[translation/tbmanual-contentspot_completed] Update translations for tbmanual-contentspot_completed
by translation＠torproject.org 11 Apr '19

11 Apr '19

commit 459529fdf3ad0189839b89ef8a6ba7602a983935 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 11 19:48:11 2019 +0000 Update translations for tbmanual-contentspot_completed --- contents+tr.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contents+tr.po b/contents+tr.po index 638008e61..877985b33 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -5,6 +5,7 @@ # erinm, 2019 # Emma Peel, 2019 # ilkeryus <ilkeryus(a)gmail.com>, 2019 +# Arda Büyükkaya <ardabuyukkaya(a)protonmail.com>, 2019 # msgid "" msgstr "" @@ -12,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-04-09 09:20+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: ilkeryus <ilkeryus(a)gmail.com>, 2019\n" +"Last-Translator: Arda Büyükkaya <ardabuyukkaya(a)protonmail.com>, 2019\n" "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -68,7 +69,7 @@ msgstr "Uygulama Ekleri" #: https//tb-manual.torproject.org/en-US/menu/ #: (content/menu/contents+en-US.lrtopic.body) msgid "Becoming a Tor translator" -msgstr "" +msgstr "Tor tercümanı olmak" #: https//tb-manual.torproject.org/en-US/about/ #: (content/about/contents+en-US.lrtopic.title)

1 0

[translation/tbmanual-contentspot] Update translations for tbmanual-contentspot
by translation＠torproject.org 11 Apr '19

11 Apr '19

commit 97acf73e6bb7ceb927e9c6ecd5681d317fee8be3 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 11 19:48:05 2019 +0000 Update translations for tbmanual-contentspot --- contents+tr.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contents+tr.po b/contents+tr.po index 638008e61..877985b33 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -5,6 +5,7 @@ # erinm, 2019 # Emma Peel, 2019 # ilkeryus <ilkeryus(a)gmail.com>, 2019 +# Arda Büyükkaya <ardabuyukkaya(a)protonmail.com>, 2019 # msgid "" msgstr "" @@ -12,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-04-09 09:20+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: ilkeryus <ilkeryus(a)gmail.com>, 2019\n" +"Last-Translator: Arda Büyükkaya <ardabuyukkaya(a)protonmail.com>, 2019\n" "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -68,7 +69,7 @@ msgstr "Uygulama Ekleri" #: https//tb-manual.torproject.org/en-US/menu/ #: (content/menu/contents+en-US.lrtopic.body) msgid "Becoming a Tor translator" -msgstr "" +msgstr "Tor tercümanı olmak" #: https//tb-manual.torproject.org/en-US/about/ #: (content/about/contents+en-US.lrtopic.title)

1 0

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 11 Apr '19

11 Apr '19

commit 2877699ed71b5891fe6380ad50ea10f1707cdcfb Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 11 19:45:37 2019 +0000 Update translations for donatepages-messagespot --- locale/tr/LC_MESSAGES/messages.po | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/locale/tr/LC_MESSAGES/messages.po b/locale/tr/LC_MESSAGES/messages.po index 58a155920..662f01a14 100644 --- a/locale/tr/LC_MESSAGES/messages.po +++ b/locale/tr/LC_MESSAGES/messages.po @@ -4,7 +4,6 @@ # escher <escherichia2(a)msn.com>, 2018 # Hakan Y <hakan_yalniz(a)live.com>, 2018 # psiphon3 <psiphon3(a)gmail.com>, 2018 -# Arda Büyükkaya <ardabuyukkaya(a)protonmail.com>, 2019 # cenk y. <goncagul(a)national.shitposting.agency>, 2019 # Lale Fatoş Tunçman <latuna63(a)gmail.com>, 2019 # Taha Karadoğan <tahakaradogan(a)gmail.com>, 2019 @@ -12,10 +11,11 @@ # Kaya Zeren <kayazeren(a)gmail.com>, 2019 # erinm, 2019 # Alperen Kitapçı <alperenmirac(a)gmail.com>, 2019 +# Arda Büyükkaya <ardabuyukkaya(a)protonmail.com>, 2019 # msgid "" msgstr "" -"Last-Translator: Alperen Kitapçı <alperenmirac(a)gmail.com>, 2019\n" +"Last-Translator: Arda Büyükkaya <ardabuyukkaya(a)protonmail.com>, 2019\n" "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n" "Language: tr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" @@ -79,6 +79,11 @@ msgid "" "reliable source of funds to help us be nimble in an ever-changing privacy " "landscape." msgstr "" +"Çevrimiçi olarak insanların gizliliğini ve kimliğini koruyan araçlar " +"sağlamak, görevimizde uyanık kalmak için aylık bağışçılara - Gizlilik " +"Savunucularına - ihtiyacımız var. Gizlilik Savunucuları, her ay mütevazı bir" +" miktar taahhüt ederler - sürekli değişen bir gizlilik ortamında bize " +"ulaşmamıza yardımcı olacak sabit, güvenilir bir fon kaynağı oluştururlar." #: tmp/cache_locale/f1/f1c758a0a2b3397f444e81463a5afc68c251bdbcd430c9979e3044b79d32dffc.php:105 msgid "" @@ -96,10 +101,13 @@ msgid "" "your monthly donation now and stand with the Tor Project at this critical " "time." msgstr "" +"Sizin yardımınızla, Tor network herkesin erişebileceği hale getireceğiz. " +"Birlikte, evrensel mahremiyet hakkı için ayağa kalkacağız. Lütfen aylık " +"bağışınızı şimdi yapın ve bu kritik zamanda Tor Projesi'ne katılın." #: tmp/cache_locale/f1/f1c758a0a2b3397f444e81463a5afc68c251bdbcd430c9979e3044b79d32dffc.php:115 msgid "Want to make a one time donation instead?" -msgstr "" +msgstr "Bunun yerine bir kez bağış yapmak ister misiniz?" #: tmp/cache_locale/f1/f1c758a0a2b3397f444e81463a5afc68c251bdbcd430c9979e3044b79d32dffc.php:122 #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:102 @@ -227,7 +235,7 @@ msgstr "aylık" #: tmp/cache_locale/f1/f1c758a0a2b3397f444e81463a5afc68c251bdbcd430c9979e3044b79d32dffc.php:284 msgid "Monthly giving" -msgstr "" +msgstr "Aylık bağış" #: tmp/cache_locale/e1/e1e12763540d9524f8871157240d5a8fbf2ea77ace1c46527b3031db68943acc.php:34 msgid "Processing Donation - Tor" @@ -363,7 +371,7 @@ msgstr "Soyad" #: tmp/cache_locale/ce/cec5a6fe643ad38144e0af02cadfaaf024540f1f46db44998f6c033630795bef.php:41 msgid "Estimated Donation Date:" -msgstr "" +msgstr "Tahmini Bağış Tarihi:" #: tmp/cache_locale/ce/cec5a6fe643ad38144e0af02cadfaaf024540f1f46db44998f6c033630795bef.php:46 msgid "Email" @@ -371,19 +379,19 @@ msgstr "E-posta" #: tmp/cache_locale/ce/cec5a6fe643ad38144e0af02cadfaaf024540f1f46db44998f6c033630795bef.php:51 msgid "Choose a Currency" -msgstr "" +msgstr "Para Birimi Seçiniz" #: tmp/cache_locale/ce/cec5a6fe643ad38144e0af02cadfaaf024540f1f46db44998f6c033630795bef.php:73 msgid "Currency Amount" -msgstr "" +msgstr "Döviz tutarı" #: tmp/cache_locale/ce/cec5a6fe643ad38144e0af02cadfaaf024540f1f46db44998f6c033630795bef.php:80 msgid "Report Donation" -msgstr "" +msgstr "Bağış Bildirimi" #: tmp/cache_locale/ce/cec5a6fe643ad38144e0af02cadfaaf024540f1f46db44998f6c033630795bef.php:87 msgid "Wallet Addresses" -msgstr "" +msgstr "Cüzdan Adresleri" #: tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:34 msgid "Tor Privacy Policy" @@ -878,6 +886,9 @@ msgid "" "If you have any questions, or would like to donate a cryptocurrency not " "listed below, please email us at giving(a)torproject.org." msgstr "" +"Herhangi bir sorunuz varsa veya aşağıda listelenmeyen bir cryptocurrency " +"parası bağışlamak istiyorsanız, lütfen bize e-posta ile gönderin " +"giving(a)torproject.org." #: tmp/cache_locale/6f/6f67db0a5268c67c9254c73517aaaea60c8c65a268f9242703a3299173f14b74.php:22 msgid "See if your employer offers employee gift matching"

1 0

[goptlib/master] Bug 28940: add support for LOG.
by dcf＠torproject.org 11 Apr '19

11 Apr '19

commit 350ea810838a99d9fc9bf7e3523fcc5635691eed Author: David Fifield <david(a)bamsoftware.com> Date: Thu Feb 7 19:56:13 2019 -0700 Bug 28940: add support for LOG. --- pt.go | 65 +++++++++++++++++++++++++++++++ pt_test.go | 128 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 193 insertions(+) diff --git a/pt.go b/pt.go index f7929e6..23893f4 100644 --- a/pt.go +++ b/pt.go @@ -24,6 +24,7 @@ // conn, err := ln.AcceptSocks() // if err != nil { // if e, ok := err.(net.Error); ok && e.Temporary() { +// pt.Log(pt.LogSeverityError, "accept error: " + err.Error()) // continue // } // return err @@ -83,6 +84,7 @@ // if e, ok := err.(net.Error); ok && e.Temporary() { // continue // } +// pt.Log(pt.LogSeverityError, "accept error: " + err.Error()) // return err // } // go handler(conn) @@ -347,6 +349,69 @@ func ProxyDone() { fmt.Fprintf(Stdout, "PROXY DONE\n") } +// Unexported type to represent log severities, preventing external callers from +// inventing new severity strings that may violate quoting rules. +// +// pt-spec.txt section 3.3.4 specifies quoting for MESSAGE, but not for +// SEVERITY, and the example shows an unquoted "SEVERITY=debug". While we know +// tor's parser permits quoting of SEVERITY, it's not actually specified. +// Therefore we we need to guard against callers passing a string that violates +// the global protocol constraint of "any US-ASCII character but NUL or NL." So +// here, we instantiate exactly the five supported severities, using a type that +// cannot be constructed outside the package. +type logSeverity struct { + string +} + +// Severity levels for the Log function. +var ( + LogSeverityError = logSeverity{"error"} + LogSeverityWarning = logSeverity{"warning"} + LogSeverityNotice = logSeverity{"notice"} + LogSeverityInfo = logSeverity{"info"} + LogSeverityDebug = logSeverity{"debug"} +) + +// Encode a string according to the CString rules of section 2.1.1 in +// control-spec.txt. +// CString = DQUOTE *qcontent DQUOTE +// "...in a CString, the escapes '\n', '\t', '\r', and the octal escapes '\0' +// ... '\377' represent newline, tab, carriage return, and the 256 possible +// octet values respectively." +// RFC 2822 section 3.2.5 in turn defines what byte values we need to escape: +// everything but +// NO-WS-CTL / ; Non white space controls +// %d33 / ; The rest of the US-ASCII +// %d35-91 / ; characters not including "\" +// %d93-126 ; or the quote character +// Technically control-spec.txt requires us to escape the space character (32), +// but it is an error in the spec: https://bugs.torproject.org/29432. +// +// We additionally need to ensure that whatever we return passes argIsSafe, +// because strings encoded by this function are printed verbatim by Log. +func encodeCString(s string) string { + result := bytes.NewBuffer([]byte{}) + result.WriteByte('"') + for _, c := range []byte(s) { + if c == 32 || c == 33 || (35 <= c && c <= 91) || (93 <= c && c <= 126) { + result.WriteByte(c) + } else { + fmt.Fprintf(result, "\\%03o", c) + } + } + result.WriteByte('"') + return result.String() +} + +// Emit a LOG message with the given severity (one of LogSeverityError, +// LogSeverityWarning, LogSeverityNotice, LogSeverityInfo, or LogSeverityDebug). +func Log(severity logSeverity, message string) { + // "<Message> contains the log message which can be a String or CString..." + // encodeCString always makes the string safe to emit; i.e., it + // satisfies argIsSafe. + line("LOG", "SEVERITY="+severity.string, "MESSAGE="+encodeCString(message)) +} + // Get a pluggable transports version offered by Tor and understood by us, if // any. The only version we understand is "1". This function reads the // environment variable TOR_PT_MANAGED_TRANSPORT_VER. diff --git a/pt_test.go b/pt_test.go index 70f5533..d74d6d7 100644 --- a/pt_test.go +++ b/pt_test.go @@ -959,3 +959,131 @@ func TestMakeStateDir(t *testing.T) { t.Errorf("MakeStateDir with a subdirectory of a file unexpectedly succeeded") } } + +// Compare with unescape_string in tor's src/lib/encoding/cstring.c. That +// function additionally allows hex escapes, but control-spec.txt's CString +// doesn't say anything about that. +func decodeCString(enc string) (string, error) { + var result bytes.Buffer + b := []byte(enc) + state := "^" + number := 0 + i := 0 + for i < len(b) { + c := b[i] + switch state { + case "^": + if c != '"' { + return "", fmt.Errorf("missing start quote") + } + state = "." + case ".": + switch c { + case '\\': + state = "\\" + case '"': + state = "$" + default: + result.WriteByte(c) + } + case "\\": + switch c { + case 'n': + result.WriteByte('\n') + state = "." + case 't': + result.WriteByte('\t') + state = "." + case 'r': + result.WriteByte('\r') + state = "." + case '"', '\\': + result.WriteByte(c) + state = "." + case '0', '1', '2', '3', '4', '5', '6', '7': + number = int(c - '0') + state = "o1" + default: + return "", fmt.Errorf("unknown escape \\%c", c) + } + case "o1": // 1 octal digit read + switch c { + case '0', '1', '2', '3', '4', '5', '6', '7': + number = number*8 + int(c-'0') + state = "o2" + default: + if number > 255 { + return "", fmt.Errorf("invalid octal escape") + } + result.WriteByte(byte(number)) + state = "." + continue // process the current byte again + } + case "o2": // 2 octal digits read + switch c { + case '0', '1', '2', '3', '4', '5', '6', '7': + number = number*8 + int(c-'0') + if number > 255 { + return "", fmt.Errorf("invalid octal escape") + } + result.WriteByte(byte(number)) + state = "." + default: + if number > 255 { + return "", fmt.Errorf("invalid octal escape") + } + result.WriteByte(byte(number)) + state = "." + continue // process the current byte again + } + case "$": + return "", fmt.Errorf("trailing garbage") + } + i++ + } + if state != "$" { + return "", fmt.Errorf("unexpected end of string") + } + return result.String(), nil +} + +func roundtripCString(src string) (string, error) { + enc := encodeCString(src) + dec, err := decodeCString(enc) + if err != nil { + return enc, fmt.Errorf("failed to decode: %+q → %+q: %v", src, enc, err) + } + if dec != src { + return enc, fmt.Errorf("roundtrip failed: %+q → %+q → %+q", src, enc, dec) + } + return enc, nil +} + +func TestEncodeCString(t *testing.T) { + tests := []string{ + "", + "\"", + "\"\"", + "abc\"def", + "\\", + "\\\\", + "\x0123abc", // trap here is if you encode '\x01' as "\\1"; it would join with the following digits: "\\123abc". + "\n\r\t\x7f", + "\\377", + } + allBytes := make([]byte, 256) + for i := 0; i < len(allBytes); i++ { + allBytes[i] = byte(i) + } + tests = append(tests, string(allBytes)) + + for _, test := range tests { + enc, err := roundtripCString(test) + if err != nil { + t.Error(err) + } + if !argIsSafe(enc) { + t.Errorf("escaping %+q resulted in non-safe %+q", test, enc) + } + } +}

1 0