code review 6011046: encoding/pem: ignore spaces and tabs at the end of head...

encoding/pem: ignore spaces and tabs at the end of header lines.

Fixes issue 3502.

[agl1, 2012-04-12 15:18:05]

Hello bradfitz@golang.org (cc: golang-dev@googlegroups.com),

I'd like you to review this change to
https://go.googlecode.com/hg/

[bradfitz, 2012-04-12 15:22:42]

LGTM

Did you try adding spaces after "-----BEGIN CERTIFICATE-----" too, as OP
had problems with?


On Thu, Apr 12, 2012 at 8:18 AM, <agl@golang.org> wrote:

> Reviewers: bradfitz,
>
> Message:
> Hello bradfitz@golang.org (cc: golang-dev@googlegroups.com),
>
> I'd like you to review this change to
> https://go.googlecode.com/hg/
>
>
> Description:
> encoding/pem: ignore spaces and tabs at the end of header lines.
>
> Fixes issue 3502.
>
> Please review this at
http://codereview.appspot.com/**6011046/<http://codereview.appspot.com/6011046/>
>
> Affected files:
>  M src/pkg/encoding/pem/pem.go
>  M src/pkg/encoding/pem/pem_test.**go
>
>
> Index: src/pkg/encoding/pem/pem.go
> ==============================**==============================**=======
> --- a/src/pkg/encoding/pem/pem.go
> +++ b/src/pkg/encoding/pem/pem.go
> @@ -28,9 +28,10 @@
>  }
>
>  // getLine results the first \r\n or \n delineated line from the given
> byte
> -// array. The line does not include the \r\n or \n. The remainder of the
> byte
> -// array (also not including the new line bytes) is also returned and
> this will
> -// always be smaller than the original argument.
> +// array. The line does not include trailing whitespace or the trailing
> new
> +// line bytes. The remainder of the byte array (also not including the
> new line
> +// bytes) is also returned and this will always be smaller than the
> original
> +// argument.
>  func getLine(data []byte) (line, rest []byte) {
>        i := bytes.Index(data, []byte{'\n'})
>        var j int
> @@ -43,7 +44,7 @@
>                        i--
>                }
>        }
> -       return data[0:i], data[j:]
> +       return bytes.TrimRight(data[0:i], " \t"), data[j:]
>  }
>
>  // removeWhitespace returns a copy of its input with all spaces, tab and
> Index: src/pkg/encoding/pem/pem_test.**go
> ==============================**==============================**=======
> --- a/src/pkg/encoding/pem/pem_**test.go
> +++ b/src/pkg/encoding/pem/pem_**test.go
> @@ -130,10 +130,10 @@
>  -----BEGIN CERTIFICATE-----
>  MIID6TCCA1ICAQEwDQYJKoZIhvcNAQ**EFBQAwgYsxCzAJBgNVBAYTAlVTMRMw**EQYD
>  VQQIEwpDYWxpZm9ybmlhMRYwFAYDVQ**QHEw1TYW4gRnJhbmNpc2NvMRQwEgYD**VQQK
> -**EwtHb29nbGUgSW5jLjEMMAoGA1UECx**MDRW5nMQwwCgYDVQQDEwNhZ2wxHTAb**Bgkq
> -**hkiG9w0BCQEWDmFnbEBnb29nbGUuY2**9tMB4XDTA5MDkwOTIyMDU0M1oXDTEw**MDkw
> -**OTIyMDU0M1owajELMAkGA1UEBhMCQV**UxEzARBgNVBAgTClNvbWUtU3RhdGUx**ITAf
> -**BgNVBAoTGEludGVybmV0IFdpZGdpdH**MgUHR5IEx0ZDEjMCEGA1UEAxMaZXVy**b3Bh
> +**EwtHb29nbGUgSW5jLjEMMAoGA1UECx**MDRW5nMQwwCgYDVQQDEwNhZ2wxHTAb**Bgkq
> +**hkiG9w0BCQEWDmFnbEBnb29nbGUuY2**9tMB4XDTA5MDkwOTIyMDU0M1oXDTEw**MDkw
> +**OTIyMDU0M1owajELMAkGA1UEBhMCQV**UxEzARBgNVBAgTClNvbWUtU3RhdGUx**ITAf
>
> +**BgNVBAoTGEludGVybmV0IFdpZGdpdH**MgUHR5IEx0ZDEjMCEGA1UEAxMaZXVy**b3Bh
>
>  LnNmby5jb3JwLmdvb2dsZS5jb20wgg**IiMA0GCSqGSIb3DQEBAQUAA4ICDwAw**ggIK
>  AoICAQC6pgYt7/EibBDumASF+**S0qvqdL/f+nouJw2T1Qc8GmXF/**iiUcrsgzh/Fd8
>  pDhz/T96Qg9IyR4ztuc2MXrmPra+**zAuSf5bevFReSqvpIt8Duv0HbDbcqs**/XKPfB
> @@ -149,15 +149,15 @@
>  SIb3DQEBBQUAA4GBAOKnQDtqBV24vV**qvesL5dnmyFpFPXBn3WdFfwD6DzEb2**1UVG
>  5krmJiu+**ViipORJPGMkgoL6BjU21XI95VQbun5**P8vvg8Z+FnFsvRFY3e1CCzAVQY
>  ZsUkLw2I7zI/dNlWdB8Xp7v+**3w9sX5N3J/**WuJ1KOO5m26kRlHQo7EzT3974g
> ------END CERTIFICATE-----
> +-----END CERTIFICATE-----
>  1 s:/C=ZA/O=Ca Inc./CN=CA Inc
>
> ------BEGIN RSA PRIVATE KEY-----
> -Proc-Type: 4,ENCRYPTED
> -DEK-Info: DES-EDE3-CBC,80C7C7A09690757A
> -
> +-----BEGIN RSA PRIVATE KEY-----
> +Proc-Type: 4,ENCRYPTED
> +DEK-Info: DES-EDE3-CBC,80C7C7A09690757A
> +
>  eQp5ZkH6CyHBz7BZfUPxyLCCmftsBJ**7HlqGb8Ld21cSwnzWZ4/**SIlhyrUtsfw7VR
> -2TTwA+**odo9ex7GdxOTaH8oZFumIRoiEjHsk8**U7Bhntp+ekkPP79xunnN7hb7hkhr
> +2TTwA+**odo9ex7GdxOTaH8oZFumIRoiEjHsk8**U7Bhntp+ekkPP79xunnN7hb7hkhr
>  yGDQZgA7s2cQHQ71v3gwT2BACAft26**jCjbM1wgNzBnJ8M0Rzn68YWqaPtdBu**8qb/
>  zVR5JB1mnqvTSbFsfF5yMc6o2WQ9jJ**Cl6KypnMl+BpL+**dlvdjYVK4l9lYsB1Hs3d
>  +zDBbWxos818zzhS8/**y6eIfiSG27cqrbhURbmgiSfDXjncK4**m/pLcQ7mmBL6mFOr
>
>
>

[agl1, 2012-04-12 16:28:32]

On 2012/04/12 15:22:42, bradfitz wrote:
> LGTM
> 
> Did you try adding spaces after "-----BEGIN CERTIFICATE-----" too, as OP
> had problems with?

The "-----BEGIN RSA PRIVATE KEY-----" line tested this, but with headers. Have
added a space after the "-----BEGIN CERTIFICATE-----" line too.


Cheers

AGL

[agl1, 2012-04-12 16:34:20]

*** Submitted as http://code.google.com/p/go/source/detail?r=5eadbc72f1d2 ***

encoding/pem: ignore spaces and tabs at the end of header lines.

Fixes issue 3502.

R=bradfitz
CC=golang-dev
http://codereview.appspot.com/6011046