Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
I
irmago
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
IRMA
Github mirrors
irmago
Commits
4953edc7
Commit
4953edc7
authored
Sep 09, 2019
by
Sietse Ringers
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: support POSTing []byte in transport
parent
e7954d65
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
15 deletions
+21
-15
transport.go
transport.go
+21
-15
No files found.
transport.go
View file @
4953edc7
...
...
@@ -4,6 +4,7 @@ import (
"bytes"
"context"
"crypto/sha256"
"encoding/base64"
"encoding/json"
"io"
"io/ioutil"
...
...
@@ -96,7 +97,7 @@ func (transport *HTTPTransport) SetHeader(name, val string) {
}
func
(
transport
*
HTTPTransport
)
request
(
url
string
,
method
string
,
reader
io
.
Reader
,
isstr
bool
,
url
string
,
method
string
,
reader
io
.
Reader
,
contenttype
string
,
)
(
response
*
http
.
Response
,
err
error
)
{
var
req
retryablehttp
.
Request
req
.
Request
,
err
=
http
.
NewRequest
(
method
,
transport
.
Server
+
url
,
reader
)
...
...
@@ -105,12 +106,8 @@ func (transport *HTTPTransport) request(
}
req
.
Header
.
Set
(
"User-Agent"
,
"irmago"
)
if
reader
!=
nil
{
if
isstr
{
req
.
Header
.
Set
(
"Content-Type"
,
"text/plain; charset=UTF-8"
)
}
else
{
req
.
Header
.
Set
(
"Content-Type"
,
"application/json; charset=UTF-8"
)
}
if
reader
!=
nil
&&
contenttype
!=
""
{
req
.
Header
.
Set
(
"Content-Type"
,
contenttype
)
}
for
name
,
val
:=
range
transport
.
headers
{
req
.
Header
.
Set
(
name
,
val
)
...
...
@@ -131,24 +128,30 @@ func (transport *HTTPTransport) jsonRequest(url string, method string, result in
panic
(
"Cannot GET and also post an object"
)
}
var
isstr
bool
var
reader
io
.
Reader
var
contenttype
string
if
object
!=
nil
{
var
objstr
string
if
objstr
,
isstr
=
object
.
(
string
);
isstr
{
Logger
.
Trace
(
"transport: body: "
,
objstr
)
reader
=
bytes
.
NewBuffer
([]
byte
(
objstr
))
}
else
{
switch
o
:=
object
.
(
type
)
{
case
[]
byte
:
Logger
.
Trace
(
"transport: body (base64): "
,
base64
.
StdEncoding
.
EncodeToString
(
o
))
contenttype
=
"application/octet-stream"
reader
=
bytes
.
NewBuffer
(
o
)
case
string
:
Logger
.
Trace
(
"transport: body: "
,
o
)
contenttype
=
"text/plain; charset=UTF-8"
reader
=
bytes
.
NewBuffer
([]
byte
(
o
))
default
:
marshaled
,
err
:=
json
.
Marshal
(
object
)
if
err
!=
nil
{
return
&
SessionError
{
ErrorType
:
ErrorSerialization
,
Err
:
err
}
}
Logger
.
Trace
(
"transport: body: "
,
string
(
marshaled
))
contenttype
=
"application/json; charset=UTF-8"
reader
=
bytes
.
NewBuffer
(
marshaled
)
}
}
res
,
err
:=
transport
.
request
(
url
,
method
,
reader
,
isstr
)
res
,
err
:=
transport
.
request
(
url
,
method
,
reader
,
contenttype
)
if
err
!=
nil
{
return
err
}
...
...
@@ -171,6 +174,9 @@ func (transport *HTTPTransport) jsonRequest(url string, method string, result in
}
Logger
.
Tracef
(
"transport: response: %s"
,
string
(
body
))
if
result
==
nil
{
// caller doesn't care about server response
return
nil
}
if
_
,
resultstr
:=
result
.
(
*
string
);
resultstr
{
*
result
.
(
*
string
)
=
string
(
body
)
}
else
{
...
...
@@ -184,7 +190,7 @@ func (transport *HTTPTransport) jsonRequest(url string, method string, result in
}
func
(
transport
*
HTTPTransport
)
GetBytes
(
url
string
)
([]
byte
,
error
)
{
res
,
err
:=
transport
.
request
(
url
,
http
.
MethodGet
,
nil
,
false
)
res
,
err
:=
transport
.
request
(
url
,
http
.
MethodGet
,
nil
,
""
)
if
err
!=
nil
{
return
nil
,
&
SessionError
{
ErrorType
:
ErrorTransport
,
Err
:
err
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment