A working proxy exists.

This commit is contained in:
2021-02-27 22:25:50 +01:00
parent ce94bf0d89
commit 617d7834cc
29 changed files with 781 additions and 195 deletions

View File

@@ -3,12 +3,16 @@ package main
import ( import (
"bytes" "bytes"
"fmt" "fmt"
"io"
"ippserver/packages/ipp" "ippserver/packages/ipp"
"net/http" "net/http"
"os"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
) )
const printerURI = "brn30055cb5e3ae.local:631/ipp/print"
//application/ipp //application/ipp
// brn30055cb5e3ae.local:631/ipp/print // brn30055cb5e3ae.local:631/ipp/print
func main() { func main() {
@@ -17,14 +21,12 @@ func main() {
customFormatter.TimestampFormat = "2006-01-02 15:04:05" customFormatter.TimestampFormat = "2006-01-02 15:04:05"
log.SetFormatter(customFormatter) log.SetFormatter(customFormatter)
customFormatter.FullTimestamp = true customFormatter.FullTimestamp = true
log.SetLevel(log.DebugLevel) log.SetLevel(log.InfoLevel)
const printerUri = "brn30055cb5e3ae.local:631/ipp/print"
request := ipp.NewRequest(ipp.GetPrinterAttributes, 10) request := ipp.NewRequest(ipp.GetPrinterAttributes, 10)
request.AddOperatonAttribute(ipp.NewCharSetValue("attributes-charset", "utf-8")) request.AddOperatonAttribute(ipp.NewCharSetValue("attributes-charset", "utf-8"))
request.AddOperatonAttribute(ipp.NewNaturalLanguage("attributes-natural-language", "en")) request.AddOperatonAttribute(ipp.NewNaturalLanguage("attributes-natural-language", "en"))
request.AddOperatonAttribute(ipp.NewURIValue("printer-uri", "ipp://"+printerUri)) request.AddOperatonAttribute(ipp.NewURIValue("printer-uri", "ipp://"+printerURI))
r := request.Marshal() r := request.Marshal()
b := bytes.NewBuffer(r) b := bytes.NewBuffer(r)
httpResponse, err := http.Post("http://"+"brn30055cb5e3ae.local:631/ipp/print", "application/ipp", b) httpResponse, err := http.Post("http://"+"brn30055cb5e3ae.local:631/ipp/print", "application/ipp", b)
@@ -34,6 +36,88 @@ func main() {
} }
rb := ipp.NewResponse(0, 0) rb := ipp.NewResponse(0, 0)
rb.UnMarshal(httpResponse.Body) rb.UnMarshal(httpResponse.Body)
fmt.Print(r) fmt.Print(rb)
fmt.Print("\n-------------\n")
printFile("4-untitled")
} }
func printFile(fname string) {
f, err := os.Open(fname)
if err != nil {
log.Errorf("Failed to open file %v", fname)
return
}
// fileContents, err := ioutil.ReadAll(f)
// if err != nil {
// log.Errorf("Failed to read file %v", fname)
// return
// }
request := ipp.NewRequest(ipp.PrintJob, 10)
request.AddOperatonAttribute(ipp.NewCharSetValue("attributes-charset", "utf-8"))
request.AddOperatonAttribute(ipp.NewNaturalLanguage("attributes-natural-language", "en"))
request.AddOperatonAttribute(ipp.NewURIValue("printer-uri", "ipp://"+printerURI))
request.AddOperatonAttribute(ipp.NewNameWithoutLanguage("requesting-user-name", "chronos"))
request.AddOperatonAttribute(ipp.NewNameWithoutLanguage("job-name", "foobar"))
request.AddOperatonAttribute(ipp.NewMimeMediaType("document-format", "image/pwg-raster"))
//request.AddJobAttribute(ipp.NewNameWithoutLanguage("ColorModel", "Gray"))
//request.AddJobAttribute(ipp.NewNameWithoutLanguage("cupsPrintQuality", "Normal"))
//request.AddJobAttribute(ipp.NewNameWithoutLanguage("Duplex", "DuplexNoTumble"))
//request.AddJobAttribute(ipp.NewNameWithoutLanguage("job-originating-host-name", "localhost"))
//request.AddJobAttribute(ipp.NewURIValue("name string", value string)
request.AddJobAttribute(ipp.NewKeyWord("media", "iso_a4_210x297mm"))
//request.AddJobAttribute(ipp.NewKeyWord("multiple-document-handling", "separate-documents-collated-copies"))
request.AddJobAttribute(ipp.NewKeyWord("output-bin", "face-down"))
//request.AddJobAttribute(ipp.NewNameWithoutLanguage("PageSize", "A4"))
request.AddJobAttribute(ipp.NewKeyWord("print-color-mode", "monochrome"))
request.AddJobAttribute(ipp.NewSetOfResolution("printer-resolution", ipp.Resolution{CrossFeedResolution: 600, FeedResolution: 600, Unit: 3}))
request.AddJobAttribute(ipp.NewKeyWord("sides", "two-sided-long-edge"))
fmt.Print(request)
r := request.Marshal()
b := bytes.NewBuffer(r)
mr := io.MultiReader(b, f)
httpResponse, err := http.Post("http://"+"brn30055cb5e3ae.local:631/ipp/print", "application/ipp", mr)
if err != nil {
fmt.Print(err)
return
}
fmt.Print("\n---response------\n")
log.Printf("HTTP status: %v %v", httpResponse.StatusCode, httpResponse.Status)
// resp, err := io.ReadAll(httpResponse.Body)
// if err != nil {
// log.Error("could not read response")
// return
// }
// fmt.Printf("% x", resp)
rb := ipp.NewResponse(0, 0)
rb.UnMarshal(httpResponse.Body)
fmt.Print(rb)
}
/*
requesting-user-name:chronos (nameWithoutLanguagageValueTag)
job-name:2 - Untitled (nameWithoutLanguagageValueTag)
document-format : image/pwg-raster (mimeMediaTypeValueTag)
document-format : application/octet-stream (mimeMediaTypeValueTag)
PrinterAttributes
JobAttributes
ColorModel:Gray (nameWithoutLanguagageValueTag)
cupsPrintQuality:Normal (nameWithoutLanguagageValueTag)
Duplex:DuplexNoTumble (nameWithoutLanguagageValueTag)
job-originating-host-name:localhost (nameWithoutLanguagageValueTag)
job-uuid:urn:uuid:67a09d25-5df8-3026-6e9c-b55f7afee4ca (uriValueTag)
media : iso_a4_210x297mm (keywordValueTag)
multiple-document-handling : separate-documents-collated-copies (keywordValueTag)
output-bin : face-down (keywordValueTag)
PageSize:A4 (nameWithoutLanguagageValueTag)
print-color-mode : monochrome (keywordValueTag)
printer-resolution:[{600 600 3}] (resolutionValueTag)
sides : two-sided-long-edge (keywordValueTag)
*/

View File

@@ -4,35 +4,35 @@ import (
"io" "io"
) )
type charSetValue struct { type CharSetValue struct {
name string name string
value string value string
} }
func NewCharSetValue(name string, value string) *charSetValue { func NewCharSetValue(name string, value string) *CharSetValue {
c := new(charSetValue) c := new(CharSetValue)
c.name = name c.name = name
c.value = value c.value = value
return c return c
} }
func (c charSetValue) Name() string { func (c CharSetValue) Name() string {
return c.name return c.name
} }
func (c charSetValue) String() string { func (c CharSetValue) String() string {
return c.name + ":" + c.value return c.name + ":" + c.value
} }
func (c *charSetValue) valueTag() tag { func (c *CharSetValue) valueTag() tag {
return charsetValueTag return charsetValueTag
} }
func (c *charSetValue) unmarshal(byteStream io.Reader) { func (c *CharSetValue) unmarshal(byteStream io.Reader) {
c.name, c.value = unmarshalSingleValue(byteStream) c.name, c.value = unmarshalSingleValue(byteStream)
} }
func (c *charSetValue) marshal() []byte { func (c *CharSetValue) marshal() []byte {
l := 5 + len(c.name) + len(c.value) l := 5 + len(c.name) + len(c.value)
b := make([]byte, l) b := make([]byte, l)
b[0] = byte(charsetValueTag) b[0] = byte(charsetValueTag)
@@ -40,11 +40,11 @@ func (c *charSetValue) marshal() []byte {
return b return b
} }
func (c *charSetValue) marshalInto([]byte) int { func (c *CharSetValue) marshalInto([]byte) int {
return 0 return 0
} }
func (c *charSetValue) size() int { func (c *CharSetValue) size() int {
l := 1 + 4 // The attribute tag + 2 lengths l := 1 + 4 // The attribute tag + 2 lengths
l += len(c.name) l += len(c.name)
l += len(c.value) l += len(c.value)

View File

@@ -4,38 +4,38 @@ import (
"fmt" "fmt"
) )
type enum struct { type Enum struct {
name string name string
values []int32 values []int32
} }
func NewEnum(name string, values ...int32) *enum { func NewEnum(name string, values ...int32) *Enum {
e := new(enum) e := new(Enum)
e.name = name e.name = name
e.values = values e.values = values
return e return e
} }
func (e enum) Name() string { func (e Enum) Name() string {
return e.name return e.name
} }
func (e enum) String() string { func (e Enum) String() string {
return e.name + ":" + fmt.Sprint(e.values) return e.name + ":" + fmt.Sprint(e.values)
} }
func (e *enum) valueTag() tag { func (e *Enum) valueTag() tag {
return enumValueTag return enumValueTag
} }
func (e *enum) size() int { func (e *Enum) size() int {
return 9 + len(e.name) return 9 + len(e.name)
} }
func (e *enum) addValue(v interface{}) { func (e *Enum) addValue(v interface{}) {
e.values = append(e.values, v.(int32)) e.values = append(e.values, v.(int32))
} }
func (e *enum) marshal() []byte { func (e *Enum) marshal() []byte {
return marshalInteger(enumValueTag, e.name, e.values) return marshalInteger(enumValueTag, e.name, e.values)
} }

View File

@@ -7,53 +7,53 @@ import (
"io" "io"
) )
type integer struct { type Integer struct {
name string name string
values []int32 values []int32
} }
func NewInteger(name string, values ...int32) *integer { func NewInteger(name string, values ...int32) *Integer {
e := new(integer) e := new(Integer)
e.name = name e.name = name
e.values = values e.values = values
return e return e
} }
func (i integer) Name() string { func (i Integer) Name() string {
return i.name return i.name
} }
func (i integer) String() string { func (i Integer) String() string {
return i.name + ":" + fmt.Sprint(i.values) return i.name + ":" + fmt.Sprint(i.values)
} }
func (i *integer) valueTag() tag { func (i *Integer) valueTag() tag {
return integerValueTag return integerValueTag
} }
func (i *integer) size() int { func (i *Integer) size() int {
return 9 + len(i.name) // The attribute tag + 2 lengths return 9 + len(i.name) // The attribute tag + 2 lengths
} }
func (i *integer) addValue(v interface{}) { func (i *Integer) addValue(v interface{}) {
i.values = append(i.values, v.(int32)) i.values = append(i.values, v.(int32))
} }
func (i *integer) marshal() []byte { func (i *Integer) marshal() []byte {
return marshalInteger(integerValueTag, i.name, i.values) return marshalInteger(integerValueTag, i.name, i.values)
} }
func marshalInteger(t tag, name string, values []int32) []byte { func marshalInteger(t tag, name string, values []int32) []byte {
l := 9 + len(name) l := 9 + len(name) + 9*(len(values)-1)
b := make([]byte, 0, l) b := make([]byte, 0, l)
buf := bytes.NewBuffer(b) buf := bytes.NewBuffer(b)
buf.WriteByte(byte(integerValueTag)) buf.WriteByte(byte(t))
binary.Write(buf, binary.BigEndian, uint16(len(name))) binary.Write(buf, binary.BigEndian, uint16(len(name)))
buf.WriteString(name) buf.WriteString(name)
binary.Write(buf, binary.BigEndian, uint16(4)) binary.Write(buf, binary.BigEndian, uint16(4))
binary.Write(buf, binary.BigEndian, values[0]) binary.Write(buf, binary.BigEndian, values[0])
for _, v := range values[1:] { for _, v := range values[1:] {
buf.WriteByte(byte(integerValueTag)) buf.WriteByte(byte(t))
binary.Write(buf, binary.BigEndian, uint16(0)) binary.Write(buf, binary.BigEndian, uint16(0))
binary.Write(buf, binary.BigEndian, uint16(4)) binary.Write(buf, binary.BigEndian, uint16(4))
binary.Write(buf, binary.BigEndian, v) binary.Write(buf, binary.BigEndian, v)

View File

@@ -1,37 +1,37 @@
package ipp package ipp
type keyWord struct { type KeyWord struct {
sos *setOfStrings sos *SetOfStrings
} }
func NewKeyWord(name string, values ...string) *keyWord { func NewKeyWord(name string, values ...string) *KeyWord {
k := new(keyWord) k := new(KeyWord)
k.sos = NewSetOfStrings(name, keyWordValueTag, values) k.sos = NewSetOfStrings(name, keyWordValueTag, values)
return k return k
} }
func (k keyWord) Name() string { func (k KeyWord) Name() string {
return k.sos.name return k.sos.name
} }
func (k keyWord) String() string { func (k KeyWord) String() string {
return k.sos.String() return k.sos.String()
} }
func (k *keyWord) size() int { func (k *KeyWord) size() int {
return k.sos.size() return k.sos.size()
} }
func (k *keyWord) valueTag() tag { func (k *KeyWord) valueTag() tag {
return k.sos.valueTag() return k.sos.valueTag()
} }
func (k *keyWord) marshal() []byte { func (k *KeyWord) marshal() []byte {
return k.sos.marshal() return k.sos.marshal()
} }
func (k *keyWord) addValue(v interface{}) { func (k *KeyWord) addValue(v interface{}) {
k.sos.AddValue(v.(string)) k.sos.AddValue(v.(string))
} }

View File

@@ -1,9 +1,11 @@
//Package ipp provides functonality to handle ipp messages //Package ipp provides functonality to handle ipp messages
//go:generate stringer -type jobState -type printerState
package ipp package ipp
import ( import (
"bufio" "bufio"
"encoding/binary" "encoding/binary"
"errors"
"fmt" "fmt"
"io" "io"
@@ -14,6 +16,9 @@ import (
// https://tools.ietf.org/html/rfc8010 // https://tools.ietf.org/html/rfc8010
// https://tools.ietf.org/html/rfc8011 // https://tools.ietf.org/html/rfc8011
// ErrNilAttribute is returned when an attempt to use nil as a attribute
var ErrNilAttribute = errors.New("can not add use nil as attribute")
// Defined value tags // Defined value tags
// from rfc8010 // from rfc8010
type tag uint8 type tag uint8
@@ -89,12 +94,27 @@ const (
Stopped printerState = 5 Stopped printerState = 5
) )
// jobstate defined in rfc8011 ch 5.3.7
type jobState uint16
const (
pending jobState = 3
pendingHeld jobState = 4
processing jobState = 5
processingStoppped jobState = 6
cancelled jobState = 7
aborted jobState = 8
completed jobState = 9
)
type statusCode uint16 type statusCode uint16
// status code defenitions // status code defenitions
const ( const (
SuccessfulOk statusCode = 0x0000 SuccessfulOk statusCode = 0x0000
ClientErrorBadRequest statusCode = 0x0400 SuccessfulOkIgnoredOrSubstitutedAttributes statusCode = 0x0001
SuccessfulOkConflictingAttributes statusCode = 0x0002
ClientErrorBadRequest statusCode = 0x0400
) )
type versionNumber uint16 type versionNumber uint16
@@ -148,13 +168,14 @@ type Attribute interface {
//size() int //size() int
} }
type attributes struct { type Attributes struct {
operation []Attribute operation []Attribute
printer []Attribute printer []Attribute
job []Attribute job []Attribute
unsupported []Attribute
} }
func (a *attributes) String() string { func (a *Attributes) String() string {
s := " OperationAttributes" + "\n" s := " OperationAttributes" + "\n"
for _, a := range a.operation { for _, a := range a.operation {
s = s + fmt.Sprintf(" %v (%v)\n", a, a.valueTag()) s = s + fmt.Sprintf(" %v (%v)\n", a, a.valueTag())
@@ -167,10 +188,15 @@ func (a *attributes) String() string {
for _, a := range a.job { for _, a := range a.job {
s = s + fmt.Sprintf(" %v (%v)\n", a, a.valueTag()) s = s + fmt.Sprintf(" %v (%v)\n", a, a.valueTag())
} }
s = s + " Unsupported" + "\n"
for _, a := range a.unsupported {
s = s + fmt.Sprintf(" %v (%v)\n", a, a.valueTag())
}
return s return s
} }
func (a *attributes) addAttribute(group tag, attr Attribute) { func (a *Attributes) addAttribute(group tag, attr Attribute) {
switch group { switch group {
case operationAttributes: case operationAttributes:
a.operation = append(a.operation, attr) a.operation = append(a.operation, attr)
@@ -178,13 +204,15 @@ func (a *attributes) addAttribute(group tag, attr Attribute) {
a.job = append(a.job, attr) a.job = append(a.job, attr)
case printerAttributes: case printerAttributes:
a.printer = append(a.printer, attr) a.printer = append(a.printer, attr)
case unsupportedAttributes:
a.unsupported = append(a.unsupported, attr)
default: default:
log.Error("Unknown attribute group") log.Errorf("Unknown attribute group %v", group)
} }
} }
func UnMarshalAttributes(bytestream *bufio.Reader) *attributes { func UnMarshalAttributes(bytestream *bufio.Reader) *Attributes {
a := new(attributes) a := new(Attributes)
var t tag var t tag
err := binary.Read(bytestream, binary.BigEndian, &t) err := binary.Read(bytestream, binary.BigEndian, &t)
@@ -290,6 +318,11 @@ func UnMarshalAttributes(bytestream *bufio.Reader) *attributes {
case begCollectionValueTag: case begCollectionValueTag:
// For now just consume the collection // For now just consume the collection
consumeCollection(bytestream) consumeCollection(bytestream)
case unsupportedValueTag:
attr := NewUnsupportedValue()
attr.unmarshal(bytestream)
a.addAttribute(currentAttributeGroup, attr)
case jobAttributes: case jobAttributes:
log.Debug("Start job attributes") log.Debug("Start job attributes")
currentAttributeGroup = jobAttributes currentAttributeGroup = jobAttributes
@@ -299,8 +332,11 @@ func UnMarshalAttributes(bytestream *bufio.Reader) *attributes {
case operationAttributes: case operationAttributes:
log.Debug("Start operation attributes") log.Debug("Start operation attributes")
currentAttributeGroup = operationAttributes currentAttributeGroup = operationAttributes
case unsupportedAttributes:
log.Debug("Start unsupported attributes")
currentAttributeGroup = unsupportedAttributes
case resolutionValueTag: case resolutionValueTag:
res := NewResolution("", 0, 0) res := NewSetOfResolution("")
res.unmarshal(bytestream) res.unmarshal(bytestream)
a.addAttribute(currentAttributeGroup, res) a.addAttribute(currentAttributeGroup, res)
log.Debugf("Resolution %v", res) log.Debugf("Resolution %v", res)

View File

@@ -1,36 +1,36 @@
package ipp package ipp
type mimeMediaType struct { type MimeMediaType struct {
sos *setOfStrings sos *SetOfStrings
} }
func NewMimeMediaType(name string, values ...string) *mimeMediaType { func NewMimeMediaType(name string, values ...string) *MimeMediaType {
m := new(mimeMediaType) m := new(MimeMediaType)
m.sos = NewSetOfStrings(name, mimeMediaTypeValueTag, values) m.sos = NewSetOfStrings(name, mimeMediaTypeValueTag, values)
return m return m
} }
func (m mimeMediaType) Name() string { func (m MimeMediaType) Name() string {
return m.sos.name return m.sos.name
} }
func (m mimeMediaType) String() string { func (m MimeMediaType) String() string {
return m.sos.String() return m.sos.String()
} }
func (m *mimeMediaType) size() int { func (m *MimeMediaType) size() int {
return m.sos.size() return m.sos.size()
} }
func (m *mimeMediaType) valueTag() tag { func (m *MimeMediaType) valueTag() tag {
return m.sos.valueTag() return m.sos.valueTag()
} }
func (m *mimeMediaType) marshal() []byte { func (m *MimeMediaType) marshal() []byte {
return m.sos.marshal() return m.sos.marshal()
} }
func (m *mimeMediaType) addValue(v interface{}) { func (m *MimeMediaType) addValue(v interface{}) {
m.sos.AddValue(v.(string)) m.sos.AddValue(v.(string))
} }

View File

@@ -4,35 +4,35 @@ import (
"io" "io"
) )
type naturalLanguage struct { type NaturalLanguage struct {
name string name string
value string value string
} }
func NewNaturalLanguage(name, value string) *naturalLanguage { func NewNaturalLanguage(name, value string) *NaturalLanguage {
c := new(naturalLanguage) c := new(NaturalLanguage)
c.name = name c.name = name
c.value = value c.value = value
return c return c
} }
func (c naturalLanguage) Name() string { func (c NaturalLanguage) Name() string {
return c.name return c.name
} }
func (c naturalLanguage) String() string { func (c NaturalLanguage) String() string {
return c.name + ":" + c.value return c.name + ":" + c.value
} }
func (c *naturalLanguage) valueTag() tag { func (c *NaturalLanguage) valueTag() tag {
return naturalLanguageValueTag return naturalLanguageValueTag
} }
func (c *naturalLanguage) unmarshal(byteStream io.Reader) { func (c *NaturalLanguage) unmarshal(byteStream io.Reader) {
c.name, c.value = unmarshalSingleValue(byteStream) c.name, c.value = unmarshalSingleValue(byteStream)
} }
func (c *naturalLanguage) marshal() []byte { func (c *NaturalLanguage) marshal() []byte {
l := 5 + len(c.name) + len(c.value) l := 5 + len(c.name) + len(c.value)
b := make([]byte, l) b := make([]byte, l)
b[0] = byte(naturalLanguageValueTag) b[0] = byte(naturalLanguageValueTag)
@@ -40,7 +40,7 @@ func (c *naturalLanguage) marshal() []byte {
return b return b
} }
func (c *naturalLanguage) size() int { func (c *NaturalLanguage) size() int {
l := 1 + 4 // The attribute tag + 2 lengths l := 1 + 4 // The attribute tag + 2 lengths
l += len(c.name) l += len(c.name)
l += len(c.value) l += len(c.value)

View File

@@ -1,4 +1,4 @@
// Code generated by "stringer -type printerState ."; DO NOT EDIT. // Code generated by "stringer -type jobState -type printerState"; DO NOT EDIT.
package ipp package ipp
@@ -13,9 +13,9 @@ func _() {
_ = x[Stopped-5] _ = x[Stopped-5]
} }
const _printerState_name = "IdlePreocessingStopped" const _printerState_name = "IdleProcessingStopped"
var _printerState_index = [...]uint8{0, 4, 15, 22} var _printerState_index = [...]uint8{0, 4, 14, 21}
func (i printerState) String() string { func (i printerState) String() string {
i -= 3 i -= 3

View File

@@ -13,36 +13,36 @@ type IRange struct {
upper int32 upper int32
} }
type rangeOfInteger struct { type RangeOfInteger struct {
name string name string
values []IRange values []IRange
} }
func NewRangeOfInteger(name string, values ...IRange) *rangeOfInteger { func NewRangeOfInteger(name string, values ...IRange) *RangeOfInteger {
r := new(rangeOfInteger) r := new(RangeOfInteger)
r.name = name r.name = name
r.values = values r.values = values
return r return r
} }
func (r *rangeOfInteger) Name() string { func (r *RangeOfInteger) Name() string {
return r.name return r.name
} }
func (r rangeOfInteger) String() string { func (r RangeOfInteger) String() string {
return r.name + ":" + fmt.Sprint(r.values) return r.name + ":" + fmt.Sprint(r.values)
} }
func (r *rangeOfInteger) valueTag() tag { func (r *RangeOfInteger) valueTag() tag {
return rangeOfIntegerValueTag return rangeOfIntegerValueTag
} }
func (r *rangeOfInteger) marshal() []byte { func (r *RangeOfInteger) marshal() []byte {
log.Error("marshal rangeOfInteger is not implemented yet") log.Error("marshal rangeOfInteger is not implemented yet")
return []byte{} return []byte{}
} }
func (r *rangeOfInteger) addValue(v interface{}) { func (r *RangeOfInteger) addValue(v interface{}) {
r.values = append(r.values, v.(IRange)) r.values = append(r.values, v.(IRange))
} }

View File

@@ -38,7 +38,7 @@ type AddValuer interface {
} }
type Request struct { type Request struct {
a *attributes a *Attributes
header ippMessageHeader header ippMessageHeader
} }
@@ -47,7 +47,7 @@ func NewRequest(op OperationID, requestID uint32) *Request {
r.header.operationID = op r.header.operationID = op
r.header.requestID = requestID r.header.requestID = requestID
r.header.versionNumber = 0x0200 r.header.versionNumber = 0x0200
r.a = new(attributes) r.a = new(Attributes)
return r return r
} }
@@ -58,7 +58,6 @@ func (r Request) String() string {
func (r *Request) UnMarshal(body io.Reader) { func (r *Request) UnMarshal(body io.Reader) {
buffbody := bufio.NewReader(body) buffbody := bufio.NewReader(body)
r.header.unmarshal(buffbody) r.header.unmarshal(buffbody)
//log.Printf("Header %v", r.header)
r.a = UnMarshalAttributes(buffbody) r.a = UnMarshalAttributes(buffbody)
} }
@@ -76,9 +75,25 @@ func (r *Request) GetAttribute(name string) Attribute {
return a return a
} }
} }
for _, a := range r.a.job {
if a.Name() == name {
return a
}
}
for _, a := range r.a.printer {
if a.Name() == name {
return a
}
}
for _, a := range r.a.unsupported {
if a.Name() == name {
return a
}
}
return nil return nil
} }
// Marshal converts the request object to a ipp request
func (r *Request) Marshal() []byte { func (r *Request) Marshal() []byte {
var buf bytes.Buffer var buf bytes.Buffer
@@ -105,14 +120,29 @@ func (r *Request) Marshal() []byte {
return buf.Bytes() return buf.Bytes()
} }
func (r *Request) AddPrinterAttribute(a Attribute) { // AddPrinterAttribute adds a printer attribute to the request object
r.a.addAttribute(printerAttributes, a) func (r *Request) AddPrinterAttribute(a Attribute) error {
if a != nil {
r.a.addAttribute(printerAttributes, a)
return nil
}
return ErrNilAttribute
} }
func (r *Request) AddOperatonAttribute(a Attribute) { // AddOperatonAttribute adds a operation attribute to the request object
r.a.addAttribute(operationAttributes, a) func (r *Request) AddOperatonAttribute(a Attribute) error {
if a != nil {
r.a.addAttribute(operationAttributes, a)
return nil
}
return ErrNilAttribute
} }
func (r *Request) AddJobAttribute(a Attribute) { // AddJobAttribute adds a job attribute to the request object
r.a.addAttribute(jobAttributes, a) func (r *Request) AddJobAttribute(a Attribute) error {
if a != nil {
r.a.addAttribute(jobAttributes, a)
return nil
}
return ErrNilAttribute
} }

View File

@@ -67,7 +67,7 @@ func TestUnmarshalRequestPrinterAttributes(T *testing.T) {
assert.Equal(T, GetPrinterAttributes, req.header.operationID, "Wrong Operation") assert.Equal(T, GetPrinterAttributes, req.header.operationID, "Wrong Operation")
assert.Equal(T, uint32(17), req.header.requestID, "Wrong request id") assert.Equal(T, uint32(17), req.header.requestID, "Wrong request id")
assert.Len(T, req.a.operation, 4) assert.Len(T, req.a.operation, 4)
v := req.GetAttribute("requested-attributes").(*keyWord).sos.values v := req.GetAttribute("requested-attributes").(*KeyWord).sos.values
assert.Len(T, v, 7) assert.Len(T, v, 7)
assert.Contains(T, v, "printer-make-and-model") assert.Contains(T, v, "printer-make-and-model")
assert.Contains(T, v, "ipp-versions-supported") assert.Contains(T, v, "ipp-versions-supported")

View File

@@ -1,67 +1,95 @@
package ipp package ipp
import ( import (
"bufio"
"bytes" "bytes"
"encoding/binary" "encoding/binary"
"fmt" "fmt"
"io"
log "github.com/sirupsen/logrus"
) )
type resolution struct { // Resolution represents a ipp resolution attribute
name string type Resolution struct {
crossFeedResolution int32 CrossFeedResolution int32
feedResolution int32 FeedResolution int32
units int8 Unit int8 // 3 seems to mean dpi (rfc3805)
} }
func NewResolution(name string, xfres int32, fres int32) *resolution { // SetOfResolutions represents a set ipp resolution attributes
r := new(resolution) type SetOfResolutions struct {
name string
sor []Resolution
}
// NewSetOfResolution creats a new set of ipp resolution attributes
func NewSetOfResolution(name string, resSet ...Resolution) *SetOfResolutions {
r := new(SetOfResolutions)
r.name = name r.name = name
r.crossFeedResolution = xfres r.sor = resSet
r.feedResolution = fres
r.units = 3 // 3 seems to mean dpi (rfc3805)
return r return r
} }
func (r *resolution) unmarshal(byteStream io.Reader) { func (r *SetOfResolutions) unmarshal(byteStream *bufio.Reader) {
var length uint16 var length uint16
binary.Read(byteStream, binary.BigEndian, &length) var res Resolution
attributeName := make([]byte, length) for {
if length > 0 { binary.Read(byteStream, binary.BigEndian, &length)
binary.Read(byteStream, binary.BigEndian, attributeName) attributeName := make([]byte, length)
if length > 0 {
binary.Read(byteStream, binary.BigEndian, attributeName)
r.name = string(attributeName)
}
binary.Read(byteStream, binary.BigEndian, &length)
if length != 9 {
panic("Wrong length in resolution")
}
binary.Read(byteStream, binary.BigEndian, &res.CrossFeedResolution)
binary.Read(byteStream, binary.BigEndian, &res.FeedResolution)
binary.Read(byteStream, binary.BigEndian, &res.Unit)
r.sor = append(r.sor, res)
var t tag
err := binary.Read(byteStream, binary.BigEndian, &t)
if err != nil {
log.Error(err.Error())
}
if t != resolutionValueTag {
byteStream.UnreadByte()
return
}
} }
r.name = string(attributeName)
binary.Read(byteStream, binary.BigEndian, &length)
if length != 9 {
panic("Wrong length in resolution")
}
binary.Read(byteStream, binary.BigEndian, &r.crossFeedResolution)
binary.Read(byteStream, binary.BigEndian, &r.feedResolution)
binary.Read(byteStream, binary.BigEndian, &r.units)
} }
func (r resolution) Name() string { // Name returns the name of the attribute
func (r SetOfResolutions) Name() string {
return r.name return r.name
} }
func (r resolution) String() string { func (r SetOfResolutions) String() string {
return fmt.Sprintf("%v:%v,%v,%v", r.name, r.crossFeedResolution, r.feedResolution, r.units) return fmt.Sprintf("%v:%v", r.name, r.sor)
} }
func (r *resolution) marshal() []byte { func (r *SetOfResolutions) marshal() []byte {
b := make([]byte, 0, 14+len(r.name)) b := make([]byte, 0, 14+len(r.name)+14*(len(r.sor)-1))
buf := bytes.NewBuffer(b) buf := bytes.NewBuffer(b)
buf.WriteByte(byte(resolutionValueTag))
binary.Write(buf, binary.BigEndian, uint16(len(r.name))) for i, res := range r.sor {
buf.WriteString(r.name) buf.WriteByte(byte(resolutionValueTag))
binary.Write(buf, binary.BigEndian, uint16(9)) if i == 0 {
binary.Write(buf, binary.BigEndian, int32(r.crossFeedResolution)) binary.Write(buf, binary.BigEndian, uint16(len(r.name)))
binary.Write(buf, binary.BigEndian, int32(r.feedResolution)) buf.WriteString(r.name)
buf.WriteByte(byte(r.units)) } else {
binary.Write(buf, binary.BigEndian, uint16(0))
}
binary.Write(buf, binary.BigEndian, uint16(9))
binary.Write(buf, binary.BigEndian, int32(res.CrossFeedResolution))
binary.Write(buf, binary.BigEndian, int32(res.FeedResolution))
buf.WriteByte(byte(res.Unit))
}
return buf.Bytes() return buf.Bytes()
} }
func (r *resolution) valueTag() tag { func (r *SetOfResolutions) valueTag() tag {
return resolutionValueTag return resolutionValueTag
} }

View File

@@ -32,14 +32,16 @@ func (h *ippResponseHeader) unmarshal(byteStream io.Reader) {
binary.Read(byteStream, binary.BigEndian, &h.requestID) binary.Read(byteStream, binary.BigEndian, &h.requestID)
} }
// Response represens a ipp response object
type Response struct { type Response struct {
a *attributes a *Attributes
header ippResponseHeader header ippResponseHeader
} }
// NewResponse creates a new ipp response object
func NewResponse(code statusCode, requestID uint32) *Response { func NewResponse(code statusCode, requestID uint32) *Response {
r := new(Response) r := new(Response)
r.a = new(attributes) r.a = new(Attributes)
r.header.versionNumber = 0x0101 r.header.versionNumber = 0x0101
r.header.requestID = requestID r.header.requestID = requestID
r.header.statusCode = code r.header.statusCode = code
@@ -50,6 +52,7 @@ func (r Response) String() string {
return r.header.String() + "\n" + r.a.String() return r.header.String() + "\n" + r.a.String()
} }
// Marshal converts the response object to a wire formatted byte stream.
func (r *Response) Marshal() []byte { func (r *Response) Marshal() []byte {
a := make([]byte, 0, 20) a := make([]byte, 0, 20)
a = append(a, r.header.marshal()...) a = append(a, r.header.marshal()...)
@@ -75,21 +78,63 @@ func (r *Response) Marshal() []byte {
return a return a
} }
// UnMarshal unmarshals a ipp response into a response object
func (r *Response) UnMarshal(body io.Reader) { func (r *Response) UnMarshal(body io.Reader) {
buffbody := bufio.NewReader(body) buffbody := bufio.NewReader(body)
r.header.unmarshal(buffbody) r.header.unmarshal(buffbody)
//log.Printf("Header %v", r.header)
r.a = UnMarshalAttributes(buffbody) r.a = UnMarshalAttributes(buffbody)
} }
func (r *Response) AddPrinterAttribute(a Attribute) { // AddPrinterAttribute adds a printer attribute to the response object
r.a.addAttribute(printerAttributes, a) func (r *Response) AddPrinterAttribute(a Attribute) error {
if a != nil {
r.a.addAttribute(printerAttributes, a)
return nil
}
return ErrNilAttribute
} }
func (r *Response) AddOperatonAttribute(a Attribute) { // AddOperatonAttribute adds a printer attribute to the response object
r.a.addAttribute(operationAttributes, a) func (r *Response) AddOperatonAttribute(a Attribute) error {
if a != nil {
r.a.addAttribute(operationAttributes, a)
return nil
}
return ErrNilAttribute
} }
func (r *Response) AddJobAttribute(a Attribute) { // AddJobAttribute adds a printer attribute to the response object
r.a.addAttribute(jobAttributes, a) func (r *Response) AddJobAttribute(a Attribute) error {
if a != nil {
r.a.addAttribute(jobAttributes, a)
return nil
}
return ErrNilAttribute
}
// GetAttribute retreives a attribute by name from the response object
// returns nil a atribute with the provided name can be found.
func (r *Response) GetAttribute(name string) Attribute {
for _, a := range r.a.operation {
if a.Name() == name {
return a
}
}
for _, a := range r.a.job {
if a.Name() == name {
return a
}
}
for _, a := range r.a.printer {
if a.Name() == name {
return a
}
}
for _, a := range r.a.unsupported {
if a.Name() == name {
return a
}
}
return nil
} }

View File

@@ -2,28 +2,31 @@ package ipp
import "encoding/binary" import "encoding/binary"
type setOfStrings struct { // SetOfStrings is the strings attribute
type SetOfStrings struct {
name string name string
values []string values []string
vTag tag vTag tag
} }
func NewSetOfStrings(name string, t tag, values []string) *setOfStrings { // NewSetOfStrings creates a new strings attribute
s := new(setOfStrings) func NewSetOfStrings(name string, t tag, values []string) *SetOfStrings {
s := new(SetOfStrings)
s.name = name s.name = name
s.vTag = t s.vTag = t
s.values = values //make([]string, 0) s.values = values //make([]string, 0)
return s return s
} }
func (s setOfStrings) String() string { func (s SetOfStrings) String() string {
r := s.name + " :" r := s.name + " :"
for _, v := range s.values { for _, v := range s.values {
r = r + " " + v r = r + " " + v
} }
return r return r
} }
func (s *setOfStrings) valueTag() tag {
func (s *SetOfStrings) valueTag() tag {
return s.vTag return s.vTag
} }
@@ -39,7 +42,7 @@ func (s *setOfStrings) valueTag() tag {
// } // }
// } // }
func (s *setOfStrings) marshal() []byte { func (s *SetOfStrings) marshal() []byte {
l := 5 + len(s.name) + len(s.values[0]) l := 5 + len(s.name) + len(s.values[0])
for i := range s.values[1:] { for i := range s.values[1:] {
l += 5 + len(s.values[i+1]) l += 5 + len(s.values[i+1])
@@ -47,7 +50,7 @@ func (s *setOfStrings) marshal() []byte {
res := make([]byte, l) res := make([]byte, l)
p := 0 p := 0
res[p] = byte(s.vTag) res[p] = byte(s.vTag)
p += 1 p++
binary.BigEndian.PutUint16(res[p:p+2], uint16(len(s.name))) binary.BigEndian.PutUint16(res[p:p+2], uint16(len(s.name)))
p += 2 p += 2
copy(res[p:], []byte(s.name)) copy(res[p:], []byte(s.name))
@@ -58,7 +61,7 @@ func (s *setOfStrings) marshal() []byte {
p += len(s.values[0]) p += len(s.values[0])
for i := range s.values[1:] { for i := range s.values[1:] {
res[p] = byte(s.vTag) res[p] = byte(s.vTag)
p += 1 p++
binary.BigEndian.PutUint16(res[p:p+2], uint16(0)) binary.BigEndian.PutUint16(res[p:p+2], uint16(0))
p = p + 2 p = p + 2
binary.BigEndian.PutUint16(res[p:p+2], uint16(len(s.values[i+1]))) binary.BigEndian.PutUint16(res[p:p+2], uint16(len(s.values[i+1])))
@@ -70,11 +73,12 @@ func (s *setOfStrings) marshal() []byte {
return res return res
} }
func (s *setOfStrings) AddValue(v string) { // AddValue adds a new sring to the set
func (s *SetOfStrings) AddValue(v string) {
s.values = append(s.values, v) s.values = append(s.values, v)
} }
func (s *setOfStrings) size() int { func (s *SetOfStrings) size() int {
l := 1 + 2 // The value tag (0x44) + name-length field (2 bytes) l := 1 + 2 // The value tag (0x44) + name-length field (2 bytes)
l += len(s.name) l += len(s.name)
l += 2 // value-length field (2 bytes) l += 2 // value-length field (2 bytes)

View File

@@ -2,35 +2,38 @@ package ipp
import "io" import "io"
type textWithoutLanguage struct { // TextWithoutLanguage is the TextWithoutLanguage attribute
type TextWithoutLanguage struct {
name string name string
value string value string
} }
func NewtextWithoutLanguage(name, value string) *textWithoutLanguage { // NewtextWithoutLanguage creates a new textWithoutLanguage attribute
c := new(textWithoutLanguage) func NewtextWithoutLanguage(name, value string) *TextWithoutLanguage {
c := new(TextWithoutLanguage)
c.name = name c.name = name
c.value = value c.value = value
return c return c
} }
func (c textWithoutLanguage) Name() string { // Name returns the name of the attribute
func (c TextWithoutLanguage) Name() string {
return c.name return c.name
} }
func (c textWithoutLanguage) String() string { func (c TextWithoutLanguage) String() string {
return c.name + ":" + c.value return c.name + ":" + c.value
} }
func (c *textWithoutLanguage) valueTag() tag { func (c *TextWithoutLanguage) valueTag() tag {
return textWithoutLanguageValueTag return textWithoutLanguageValueTag
} }
func (c *textWithoutLanguage) unmarshal(byteStream io.Reader) { func (c *TextWithoutLanguage) unmarshal(byteStream io.Reader) {
c.name, c.value = unmarshalSingleValue(byteStream) c.name, c.value = unmarshalSingleValue(byteStream)
} }
func (c *textWithoutLanguage) marshal() []byte { func (c *TextWithoutLanguage) marshal() []byte {
l := 5 + len(c.name) + len(c.value) l := 5 + len(c.name) + len(c.value)
b := make([]byte, l) b := make([]byte, l)
b[0] = byte(textWithoutLanguageValueTag) b[0] = byte(textWithoutLanguageValueTag)
@@ -38,7 +41,7 @@ func (c *textWithoutLanguage) marshal() []byte {
return b return b
} }
func (c *textWithoutLanguage) size() int { func (c *TextWithoutLanguage) size() int {
l := 1 + 4 // The attribute tag + 2 lengths l := 1 + 4 // The attribute tag + 2 lengths
l += len(c.name) l += len(c.name)
l += len(c.value) l += len(c.value)

View File

@@ -0,0 +1,40 @@
package ipp
import (
"io"
log "github.com/sirupsen/logrus"
)
// UnSupportedValue represents a ipp unsupported attributes attribute
type UnSupportedValue struct {
name string
}
// NewUnsupportedValue creates a new unsupported attributes attribute
func NewUnsupportedValue() *UnSupportedValue {
c := new(UnSupportedValue)
return c
}
func (c *UnSupportedValue) unmarshal(byteStream io.Reader) {
c.name, _ = unmarshalSingleValue(byteStream)
}
// Name returns the name of the attribute
func (c *UnSupportedValue) Name() string {
return c.name
}
func (c *UnSupportedValue) marshal() (data []byte) {
log.Error("Unmarshal unsupported value is not implemented yet")
return
}
func (c *UnSupportedValue) valueTag() tag {
return unsupportedValueTag
}
func (c UnSupportedValue) String() string {
return c.name
}

View File

@@ -4,41 +4,49 @@ import (
"io" "io"
) )
type uriValue struct { // URIValue represents a ipp URI value attribute
type URIValue struct {
name string name string
value string value string
} }
func NewURIValue(name, value string) *uriValue { // NewURIValue creates a new URIValue attribute
u := new(uriValue) func NewURIValue(name, value string) *URIValue {
u := new(URIValue)
u.name = name u.name = name
u.value = value u.value = value
return u return u
} }
func (u uriValue) Name() string { // Name returns the name of the attribute
func (u URIValue) Name() string {
return u.name return u.name
} }
func (u uriValue) String() string { // Value returns the value of the attribute
func (u URIValue) Value() string {
return u.value
}
func (u URIValue) String() string {
return u.name + ":" + u.value return u.name + ":" + u.value
} }
func (u *uriValue) valueTag() tag { func (u *URIValue) valueTag() tag {
return uriValueTag return uriValueTag
} }
func (u *uriValue) unmarshal(byteStream io.Reader) { func (u *URIValue) unmarshal(byteStream io.Reader) {
u.name, u.value = unmarshalSingleValue(byteStream) u.name, u.value = unmarshalSingleValue(byteStream)
} }
func (u *uriValue) marshal() []byte { func (u *URIValue) marshal() []byte {
res := make([]byte, u.size()) res := make([]byte, u.size())
res[0] = byte(uriValueTag) res[0] = byte(uriValueTag)
marshalNameValue(u.name, u.value, res[1:]) marshalNameValue(u.name, u.value, res[1:])
return res return res
} }
func (u *uriValue) size() int { func (u *URIValue) size() int {
l := 1 + 4 // The attribute tag + 2 lengths l := 1 + 4 // The attribute tag + 2 lengths
l += len(u.name) l += len(u.name)
l += len(u.value) l += len(u.value)

View File

@@ -8,7 +8,7 @@ import (
) )
func TestMarshalUriValue(T *testing.T) { func TestMarshalUriValue(T *testing.T) {
var u uriValue var u URIValue
u.name = "foo" u.name = "foo"
u.value = "bar" u.value = "bar"
b := u.marshal() b := u.marshal()

View File

@@ -0,0 +1,10 @@
package main
import "ippserver/packages/ipp"
func handleValidateJob(r *ipp.Request) *ipp.Response {
response := ipp.NewResponse(ipp.SuccessfulOk, r.RequestID())
response.AddOperatonAttribute(ipp.NewCharSetValue("attributes-charset", "utf-8"))
response.AddOperatonAttribute(ipp.NewNaturalLanguage("attributes-natural-language", "en"))
return response
}

View File

@@ -0,0 +1,46 @@
package main
import (
"bytes"
"fmt"
"ippserver/packages/ipp"
"net/http"
log "github.com/sirupsen/logrus"
)
func handleGetJobAttributes(r *ipp.Request, requestID uint32) *ipp.Response {
request := ipp.NewRequest(ipp.GetJobAttributes, requestID)
request.AddOperatonAttribute(ipp.NewCharSetValue("attributes-charset", "utf-8"))
request.AddOperatonAttribute(ipp.NewNaturalLanguage("attributes-natural-language", "en"))
request.AddOperatonAttribute(ipp.NewURIValue("printer-uri", "ipp://"+printerURI))
request.AddOperatonAttribute(r.GetAttribute("job-id"))
request.AddOperatonAttribute(r.GetAttribute("requesting-user-name"))
request.AddOperatonAttribute(r.GetAttribute("requested-attributes"))
log.Infof("Downstream request\n%v\n", request)
downStreamRequest := request.Marshal()
b := bytes.NewBuffer(downStreamRequest)
downStreamResponse, err := http.Post("http://"+"brn30055cb5e3ae.local:631/ipp/print", "application/ipp", b)
if err != nil {
fmt.Print(err)
}
rb := ipp.NewResponse(0, 0)
rb.UnMarshal(downStreamResponse.Body)
log.Infof("Downstream response\n%v\n", rb)
response := ipp.NewResponse(ipp.SuccessfulOk, r.RequestID())
response.AddOperatonAttribute(ipp.NewCharSetValue("attributes-charset", "utf-8"))
response.AddOperatonAttribute(ipp.NewNaturalLanguage("attributes-natural-language", "en"))
response.AddJobAttribute(rb.GetAttribute("job-id"))
response.AddJobAttribute(rb.GetAttribute("job-name"))
response.AddJobAttribute(rb.GetAttribute("job-originating-user-name"))
response.AddJobAttribute(rb.GetAttribute("job-state"))
response.AddJobAttribute(rb.GetAttribute("job-state-reasons"))
return response
}

47
proxy/handlegetjobs.go Normal file
View File

@@ -0,0 +1,47 @@
package main
import (
"bytes"
"fmt"
"ippserver/packages/ipp"
"net/http"
log "github.com/sirupsen/logrus"
)
func handleGetJobs(r *ipp.Request, requestID uint32) *ipp.Response {
request := ipp.NewRequest(ipp.GetJobs, requestID)
request.AddOperatonAttribute(ipp.NewCharSetValue("attributes-charset", "utf-8"))
request.AddOperatonAttribute(ipp.NewNaturalLanguage("attributes-natural-language", "en"))
request.AddOperatonAttribute(ipp.NewURIValue("printer-uri", "ipp://"+printerURI))
request.AddOperatonAttribute(r.GetAttribute("requesting-user-name"))
request.AddOperatonAttribute(r.GetAttribute("requested-attributes"))
log.Infof("Downstream request\n%v\n", request)
downStreamRequest := request.Marshal()
b := bytes.NewBuffer(downStreamRequest)
downStreamResponse, err := http.Post("http://"+"brn30055cb5e3ae.local:631/ipp/print", "application/ipp", b)
if err != nil {
fmt.Print(err)
}
//log.Printf("response HTTP status: %v %v", downStreamResponse.StatusCode, downStreamResponse.Status)
rb := ipp.NewResponse(0, 0)
rb.UnMarshal(downStreamResponse.Body)
log.Infof("Downstream response\n%v\n", rb)
response := ipp.NewResponse(ipp.SuccessfulOk, r.RequestID())
response.AddOperatonAttribute(ipp.NewCharSetValue("attributes-charset", "utf-8"))
response.AddOperatonAttribute(ipp.NewNaturalLanguage("attributes-natural-language", "en"))
a := rb.GetAttribute("job-id")
response.AddJobAttribute(a)
response.AddJobAttribute(rb.GetAttribute("job-name"))
response.AddJobAttribute(rb.GetAttribute("job-originating-user-name"))
response.AddJobAttribute(rb.GetAttribute("job-state"))
response.AddJobAttribute(rb.GetAttribute("job-state-reasons"))
return response
}

View File

@@ -0,0 +1,36 @@
package main
import "ippserver/packages/ipp"
func handleGetPrinterAttributes(r *ipp.Request) *ipp.Response {
response := ipp.NewResponse(ipp.SuccessfulOk, r.RequestID())
response.AddOperatonAttribute(ipp.NewCharSetValue("attributes-charset", "utf-8"))
response.AddOperatonAttribute(ipp.NewNaturalLanguage("attributes-natural-language", "en"))
response.AddPrinterAttribute(ipp.NewURIValue("printer-uri", "ipp://drpork:1234/ipp/print"))
response.AddPrinterAttribute(ipp.NewtextWithoutLanguage("printer-make-and-model", "ChroBroPrint"))
response.AddPrinterAttribute(ipp.NewEnum("printer-state", int32(ipp.Idle)))
response.AddPrinterAttribute(ipp.NewEnum("operations-supported", int32(ipp.PrintJob), int32(ipp.ValidateJob), int32(ipp.CancelJob), int32(ipp.GetJobAttributes), int32(ipp.GetJobs), int32(ipp.GetPrinterAttributes)))
response.AddPrinterAttribute(ipp.NewKeyWord("printer-state-reasons", "none"))
response.AddPrinterAttribute(ipp.NewKeyWord("ipp-versions-supported", "1.0", "1.1", "2.0"))
response.AddPrinterAttribute(ipp.NewKeyWord("ipp-features-supported", "wfds-print-1.0"))
response.AddPrinterAttribute(ipp.NewMimeMediaType("document-format-supported", "image/pwg-raster"))
response.AddPrinterAttribute(ipp.NewKeyWord("media-supported", "iso_a4_210x297mm"))
response.AddPrinterAttribute(ipp.NewKeyWord("media-default", "iso_a4_210x297mm"))
response.AddPrinterAttribute(ipp.NewKeyWord("output-mode-supported", "color", "auto", "monochrome"))
response.AddPrinterAttribute(ipp.NewKeyWord("output-mode-default", "color"))
response.AddPrinterAttribute(ipp.NewBoolean("color-supported", true))
response.AddPrinterAttribute(ipp.NewKeyWord("sides-supported", "one-sided", "two-sided-long-edge", "two-sided-short-edge"))
response.AddPrinterAttribute(ipp.NewKeyWord("print-color-mode-supported", "auto", "color", "monochrome"))
response.AddPrinterAttribute(ipp.NewKeyWord("job-creation-attributes-supported", "copies", "finishings", "ipp-attribute-fidelity",
"job-name", "media", "media-col", "orientation-requested", "output-bin", "output-mode", "print-quality", "printer-resolution",
"requesting-user-name", "sides", "print-color-mode"))
response.AddPrinterAttribute(ipp.NewEnum("print-quality-supported", int32(4), int32(5))) //normal,high
res1 := ipp.Resolution{CrossFeedResolution: 600, FeedResolution: 600, Unit: 3}
res2 := ipp.Resolution{CrossFeedResolution: 2400, FeedResolution: 600, Unit: 3}
response.AddPrinterAttribute(ipp.NewSetOfResolution("printer-resolution-default", res1))
response.AddPrinterAttribute(ipp.NewSetOfResolution("printer-resolution-supported", res1, res2))
response.AddPrinterAttribute(ipp.NewBoolean("printer-is-accepting-jobs", true))
return response
}

69
proxy/handleprintjob.go Normal file
View File

@@ -0,0 +1,69 @@
package main
import (
"bytes"
"fmt"
"io"
"ippserver/packages/ipp"
"net/http"
"net/url"
"strings"
log "github.com/sirupsen/logrus"
)
const printerURI = "brn30055cb5e3ae.local:631/ipp/print"
func handlePrintJob(r *ipp.Request, byteStream io.Reader, requestID uint32) *ipp.Response {
// This request is what will be sent to the real printer
request := ipp.NewRequest(ipp.PrintJob, requestID)
request.AddOperatonAttribute(ipp.NewCharSetValue("attributes-charset", "utf-8"))
request.AddOperatonAttribute(ipp.NewNaturalLanguage("attributes-natural-language", "en"))
request.AddOperatonAttribute(ipp.NewURIValue("printer-uri", "ipp://"+printerURI))
request.AddOperatonAttribute(r.GetAttribute("requesting-user-name"))
request.AddOperatonAttribute(r.GetAttribute("job-name"))
request.AddOperatonAttribute(ipp.NewMimeMediaType("document-format", "image/pwg-raster"))
request.AddJobAttribute(r.GetAttribute("sides"))
request.AddJobAttribute(r.GetAttribute("media"))
request.AddJobAttribute(r.GetAttribute("print-color-mode"))
request.AddJobAttribute(r.GetAttribute("printer-resolution"))
request.AddJobAttribute(r.GetAttribute("output-bin"))
log.Infof("Downstream request\n%v\n", request)
downStreamRequest := request.Marshal()
b := bytes.NewBuffer(downStreamRequest)
mr := io.MultiReader(b, byteStream)
downStreamResponse, err := http.Post("http://"+"brn30055cb5e3ae.local:631/ipp/print", "application/ipp", mr)
if err != nil {
fmt.Print(err)
}
rb := ipp.NewResponse(0, 0)
rb.UnMarshal(downStreamResponse.Body)
log.Infof("Downstream response\n%v\n", rb)
response := ipp.NewResponse(ipp.SuccessfulOk, r.RequestID())
response.AddOperatonAttribute(ipp.NewCharSetValue("attributes-charset", "utf-8"))
response.AddOperatonAttribute(ipp.NewNaturalLanguage("attributes-natural-language", "en"))
jua := rb.GetAttribute("job-uri").(*ipp.URIValue)
if jua != nil {
u, err := url.Parse(jua.Value())
if err != nil {
log.Error("could not parse job-uri")
}
l := strings.Split(u.Path, "/")
j := l[len(l)-1]
joburi := r.GetAttribute("printer-uri").(*ipp.URIValue).Value() + "/" + j
log.Infof(">>>>>>>>>>>>>>>>>>>>>>joburi: %v", joburi)
response.AddJobAttribute(ipp.NewURIValue("job-uri", joburi))
}
response.AddJobAttribute(rb.GetAttribute("job-id"))
response.AddJobAttribute(rb.GetAttribute("job-state"))
response.AddJobAttribute(rb.GetAttribute("job-state-reasons"))
return response
}

79
proxy/main.go Normal file
View File

@@ -0,0 +1,79 @@
package main
import (
"context"
"ippserver/packages/ipp"
"ippserver/packages/mdnsserver"
"net/http"
"sync"
log "github.com/sirupsen/logrus"
)
func main() {
customFormatter := new(log.TextFormatter)
customFormatter.TimestampFormat = "2006-01-02 15:04:05"
log.SetFormatter(customFormatter)
customFormatter.FullTimestamp = true
log.SetLevel(log.InfoLevel)
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
go mdnsserver.Run(ctx)
http.HandleFunc("/ipp/print", handle)
log.Info("http server started on :1234")
err := http.ListenAndServe(":1234", nil)
if err != nil {
log.Fatal("ListenAndServe: " + err.Error())
}
}
var mut sync.Mutex
var requestID uint32
func handle(w http.ResponseWriter, r *http.Request) {
mut.Lock()
requestID++
mut.Unlock()
if r.Method != http.MethodPost {
http.Error(w, "Unsupported method", http.StatusMethodNotAllowed)
}
//log.Info(r.Header)
//body := make([]byte, r.ContentLength)
//io.ReadFull(r.Body, body)
//log.Infof("Body %x", body)
request := ipp.NewRequest(0, 0)
//rdata := make([]byte, r.ContentLength)
//io.ReadFull(r.Body, rdata)
//log.Printf("Data %x", rdata)
//fmt.Printf("data % #0x", rdata)
//buf := bytes.NewBuffer(rdata)
request.UnMarshal(r.Body)
log.Infof("Upstream Request: \n%v\n", request)
var response *ipp.Response
switch request.Operation() {
case ipp.GetPrinterAttributes:
response = handleGetPrinterAttributes(request)
case ipp.PrintJob:
response = handlePrintJob(request, r.Body, requestID)
case ipp.GetJobs:
response = handleGetJobs(request, requestID)
case ipp.ValidateJob:
response = handleValidateJob(request)
case ipp.GetJobAttributes:
response = handleGetJobAttributes(request, requestID)
default:
response = ipp.NewResponse(ipp.ClientErrorBadRequest, request.RequestID())
}
log.Infof("Upstream Response:\n%v\n", response)
data := response.Marshal()
//log.Debugf("% x", data)
w.Write(data)
}

View File

@@ -0,0 +1,10 @@
package main
import "ippserver/packages/ipp"
func handleValidateJob(r *ipp.Request) *ipp.Response {
response := ipp.NewResponse(ipp.SuccessfulOk, r.RequestID())
response.AddOperatonAttribute(ipp.NewCharSetValue("attributes-charset", "utf-8"))
response.AddOperatonAttribute(ipp.NewNaturalLanguage("attributes-natural-language", "en"))
return response
}

View File

@@ -4,25 +4,33 @@ import "ippserver/packages/ipp"
func handleGetPrinterAttributes(r *ipp.Request) *ipp.Response { func handleGetPrinterAttributes(r *ipp.Request) *ipp.Response {
response := ipp.NewResponse(ipp.SuccessfulOk, r.RequestID()) response := ipp.NewResponse(ipp.SuccessfulOk, r.RequestID())
var a ipp.Attribute
a = ipp.NewCharSetValue("attributes-charset", "utf-8") response.AddOperatonAttribute(ipp.NewCharSetValue("attributes-charset", "utf-8"))
response.AddOperatonAttribute(a) response.AddOperatonAttribute(ipp.NewNaturalLanguage("attributes-natural-language", "en"))
a = ipp.NewNaturalLanguage("attributes-natural-language", "en")
response.AddOperatonAttribute(a) response.AddPrinterAttribute(ipp.NewURIValue("printer-uri", "ipp://drpork:1234/ipp/print"))
a = ipp.NewURIValue("printer-uri", "ipp://drpork:1234/ipp/print") response.AddPrinterAttribute(ipp.NewtextWithoutLanguage("printer-make-and-model", "ChroBroPrint"))
response.AddOperatonAttribute(a) response.AddPrinterAttribute(ipp.NewEnum("printer-state", int32(ipp.Idle)))
a = ipp.NewtextWithoutLanguage("printer-make-and-model", "ChroBro 001") response.AddPrinterAttribute(ipp.NewEnum("operations-supported", int32(ipp.PrintJob), int32(ipp.ValidateJob), int32(ipp.CancelJob), int32(ipp.GetJobAttributes), int32(ipp.GetJobs), int32(ipp.GetPrinterAttributes)))
response.AddOperatonAttribute(a) response.AddPrinterAttribute(ipp.NewKeyWord("printer-state-reasons", "none"))
a = ipp.NewEnum("printer-state", int32(ipp.Idle)) response.AddPrinterAttribute(ipp.NewKeyWord("ipp-versions-supported", "1.0", "1.1", "2.0"))
response.AddOperatonAttribute(a) response.AddPrinterAttribute(ipp.NewKeyWord("ipp-features-supported", "wfds-print-1.0"))
a = ipp.NewKeyWord("ipp-versions-supported", "1.0", "1.1", "2.0") response.AddPrinterAttribute(ipp.NewMimeMediaType("document-format-supported", "image/pwg-raster"))
response.AddOperatonAttribute(a) response.AddPrinterAttribute(ipp.NewKeyWord("media-supported", "iso_a4_210x297mm"))
response.AddOperatonAttribute(ipp.NewKeyWord("ipp-features-supported", "wfds-print-1.0")) response.AddPrinterAttribute(ipp.NewKeyWord("media-default", "iso_a4_210x297mm"))
response.AddOperatonAttribute(ipp.NewMimeMediaType("document-format-supported", "image/pwg-raster")) response.AddPrinterAttribute(ipp.NewKeyWord("output-mode-supported", "color", "auto", "monochrome"))
response.AddOperatonAttribute(ipp.NewKeyWord("media-supported", "iso_a4_210x297mm")) response.AddPrinterAttribute(ipp.NewKeyWord("output-mode-default", "color"))
response.AddOperatonAttribute(ipp.NewKeyWord("sides-supported", "one-sided", "two-sided-long-edge", "two-sided-short-edge")) response.AddPrinterAttribute(ipp.NewBoolean("color-supported", true))
response.AddOperatonAttribute(ipp.NewKeyWord("print-color-mode-supported", "auto", "color", "monochrome")) response.AddPrinterAttribute(ipp.NewKeyWord("sides-supported", "one-sided", "two-sided-long-edge", "two-sided-short-edge"))
response.AddOperatonAttribute(ipp.NewResolution("printer-resolution-default", 600, 600)) response.AddPrinterAttribute(ipp.NewKeyWord("print-color-mode-supported", "auto", "color", "monochrome"))
response.AddOperatonAttribute(ipp.NewBoolean("printer-is-accepting-jobs", true)) response.AddPrinterAttribute(ipp.NewKeyWord("job-creation-attributes-supported", "copies", "finishings", "ipp-attribute-fidelity",
"job-name", "media", "media-col", "orientation-requested", "output-bin", "output-mode", "print-quality", "printer-resolution",
"requesting-user-name", "sides", "print-color-mode"))
response.AddPrinterAttribute(ipp.NewEnum("print-quality-supported", int32(4), int32(5))) //normal,high
res1 := ipp.Resolution{CrossFeedResolution: 600, FeedResolution: 600, Unit: 3}
res2 := ipp.Resolution{CrossFeedResolution: 2400, FeedResolution: 600, Unit: 3}
response.AddPrinterAttribute(ipp.NewSetOfResolution("printer-resolution-default", res1))
response.AddPrinterAttribute(ipp.NewSetOfResolution("printer-resolution-supported", res1, res2))
response.AddPrinterAttribute(ipp.NewBoolean("printer-is-accepting-jobs", true))
return response return response
} }

View File

@@ -17,6 +17,8 @@ func handlePrintJob(r *ipp.Request, byteStream io.Reader) *ipp.Response {
defer f.Close() defer f.Close()
io.Copy(f, byteStream) io.Copy(f, byteStream)
response := ipp.NewResponse(ipp.SuccessfulOk, r.RequestID()) response := ipp.NewResponse(ipp.SuccessfulOk, r.RequestID())
response.AddOperatonAttribute(ipp.NewCharSetValue("attributes-charset", "utf-8"))
response.AddOperatonAttribute(ipp.NewNaturalLanguage("attributes-natural-language", "en"))
return response return response
} }

View File

@@ -30,7 +30,6 @@ func main() {
} }
func handle(w http.ResponseWriter, r *http.Request) { func handle(w http.ResponseWriter, r *http.Request) {
log.Infoln("handle")
if r.Method != http.MethodPost { if r.Method != http.MethodPost {
http.Error(w, "Unsupported method", http.StatusMethodNotAllowed) http.Error(w, "Unsupported method", http.StatusMethodNotAllowed)
@@ -56,6 +55,8 @@ func handle(w http.ResponseWriter, r *http.Request) {
response = handlePrintJob(request, r.Body) response = handlePrintJob(request, r.Body)
case ipp.GetJobs: case ipp.GetJobs:
response = handleGetJobs(request) response = handleGetJobs(request)
case ipp.ValidateJob:
response = handleValidateJob(request)
default: default:
response = ipp.NewResponse(ipp.ClientErrorBadRequest, request.RequestID()) response = ipp.NewResponse(ipp.ClientErrorBadRequest, request.RequestID())
} }