Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 72 additions & 0 deletions device_response_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
package main

import (
"fmt"
"io"
"net"
"net/http"
"net/http/httptest"
"strconv"
"strings"
"testing"
)

func testLogger() *LogMessage {
lg := NewLogger().ToNowhere()
lg.SetLevels(0)
return &lg.LogMessage
}

func TestIppGetPrinterAttributesRejectsHugeBody(t *testing.T) {
body := strings.Repeat("x", deviceResponseLimit+1)
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
io.WriteString(w, body)
}))
defer srv.Close()

_, _, err := ippGetPrinterAttributes(testLogger(), srv.Client(), NewQuirks(), srv.URL)
want := fmt.Sprintf("HTTP: response exceeds %d bytes", deviceResponseLimit)
if err == nil || err.Error() != want {
t.Fatalf("got %v, want %s", err, want)
}
}

func TestIppGetPrinterAttributesReadsSmallBody(t *testing.T) {
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
io.WriteString(w, "not-ipp")
}))
defer srv.Close()

_, _, err := ippGetPrinterAttributes(testLogger(), srv.Client(), NewQuirks(), srv.URL)
if err == nil || strings.Contains(err.Error(), "exceeds") || !strings.Contains(err.Error(), "IPP decode:") {
t.Fatalf("got %v", err)
}
}

func TestEsclServiceRejectsHugeBody(t *testing.T) {
body := strings.Repeat("x", deviceResponseLimit+1)
ln, err := net.Listen("tcp", "127.0.0.1:0")
if err != nil {
t.Fatal(err)
}
srv := &http.Server{Handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
io.WriteString(w, body)
})}
go srv.Serve(ln)
defer srv.Close()

_, portStr, err := net.SplitHostPort(ln.Addr().String())
if err != nil {
t.Fatal(err)
}
port, err := strconv.Atoi(portStr)
if err != nil {
t.Fatal(err)
}

_, err = EsclService(testLogger(), nil, port, UsbDeviceInfo{}, nil, http.DefaultClient)
want := fmt.Sprintf("eSCL: response exceeds %d bytes", deviceResponseLimit)
if err == nil || err.Error() != want {
t.Fatalf("got %v, want %s", err, want)
}
}
3 changes: 1 addition & 2 deletions escl.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import (
"errors"
"fmt"
"io"
"io/ioutil"
"net/http"
"sort"
"strings"
Expand Down Expand Up @@ -53,7 +52,7 @@ func EsclService(log *LogMessage, services *DNSSdServices,
goto ERROR
}

xmlData, err = ioutil.ReadAll(resp.Body)
xmlData, err = readDeviceBody(resp.Body)
resp.Body.Close()
if err != nil {
goto ERROR
Expand Down
16 changes: 15 additions & 1 deletion ipp.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ package main
import (
"bytes"
"fmt"
"io"
"io/ioutil"
"net/http"
"sort"
Expand Down Expand Up @@ -99,6 +100,19 @@ func IppService(log *LogMessage, services *DNSSdServices,
return
}

const deviceResponseLimit = 8 << 20

func readDeviceBody(r io.Reader) ([]byte, error) {
data, err := ioutil.ReadAll(io.LimitReader(r, deviceResponseLimit+1))
if err != nil {
return nil, err
}
if len(data) > deviceResponseLimit {
return nil, fmt.Errorf("response exceeds %d bytes", deviceResponseLimit)
}
return data, nil
}

// ippGetPrinterAttributes performs GetPrinterAttributes query,
// using the specified http.Client and uri
//
Expand Down Expand Up @@ -168,7 +182,7 @@ func ippGetPrinterAttributes(log *LogMessage, c *http.Client, quirks *Quirks,
}

// Decode IPP response message
respData, err := ioutil.ReadAll(resp.Body)
respData, err := readDeviceBody(resp.Body)
if err != nil {
err = fmt.Errorf("HTTP: %s", err)
return
Expand Down