diff options
| author | Korhonen Sami (Samlink) <k847259@ubuntu.saminet.fi> | 2020-07-09 12:09:58 +0300 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2020-07-22 14:46:31 -0400 |
| commit | 7759c8c9f32a5443970ffc11d8db14f8d3e45494 (patch) | |
| tree | 102b600821c8d33218f75f5afeeb4525ccdc53a3 /pkg/api/handlers/compat/exec.go | |
| parent | 6128cbec04fd80b62a9afe75adabd2acfd968909 (diff) | |
| download | podman-7759c8c9f32a5443970ffc11d8db14f8d3e45494.tar.gz podman-7759c8c9f32a5443970ffc11d8db14f8d3e45494.tar.bz2 podman-7759c8c9f32a5443970ffc11d8db14f8d3e45494.zip | |
Fix: Hijacking v2 endpoints to follow rfc 7230 semantics
After this patch v2 hijacking endpoints, exec/start and
containers/attach follow rfc 7230 specification.
Connection will only be upgraded, if client specifies upgrade
headers:
For tcp connections:
Connection: Upgrade
Upgrade: tcp
For unix socket connections:
Connection: Upgrade
Upgrade: sock
There are currently no checks if upgrade type actually matches with
available protocols. Implementation just protocol that client
requested
Signed-off-by: Sami Korhonen <skorhone@gmail.com>
Diffstat (limited to 'pkg/api/handlers/compat/exec.go')
| -rw-r--r-- | pkg/api/handlers/compat/exec.go | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/pkg/api/handlers/compat/exec.go b/pkg/api/handlers/compat/exec.go index aee4196dd..a3b8cb573 100644 --- a/pkg/api/handlers/compat/exec.go +++ b/pkg/api/handlers/compat/exec.go @@ -173,21 +173,11 @@ func ExecStartHandler(w http.ResponseWriter, r *http.Request) { return } - // Hijack the connection - hijacker, ok := w.(http.Hijacker) - if !ok { - utils.InternalServerError(w, errors.Errorf("unable to hijack connection")) - return - } - - connection, buffer, err := hijacker.Hijack() + connection, buffer, err := AttachConnection(w, r) if err != nil { - utils.InternalServerError(w, errors.Wrapf(err, "error hijacking connection")) + utils.InternalServerError(w, err) return } - - fmt.Fprintf(connection, AttachHeader) - logrus.Debugf("Hijack for attach of container %s exec session %s successful", sessionCtr.ID(), sessionID) if err := sessionCtr.ExecHTTPStartAndAttach(sessionID, connection, buffer, nil, nil, nil); err != nil { |