Skip to content

Handle redirects for Yun shield sketch upload #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Handle redirects for Yun shield sketch upload #99

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cf264e
Treat HTTP client redirects as errors
sandeepmistry May 13, 2016
4933fa6
Retry on 302 response for HTTP uploads
sandeepmistry May 13, 2016
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
145 changes: 88 additions & 57 deletions programmer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"bufio"
"bytes"
"encoding/json"
"errors"
"fmt"
"io"
"mime/multipart"
Expand Down Expand Up @@ -144,69 +145,99 @@ func spProgramNetwork(portname string, boardname string, filePath string, authda

// Prepare a form that you will submit to that URL.
_url := "http://" + portname + "/data/upload_sketch_silent"
var b bytes.Buffer
w := multipart.NewWriter(&b)
// Add your image file
filePath = strings.Trim(filePath, "\n")
f, err := os.Open(filePath)
if err != nil {
log.Println("Error opening file" + filePath + " err: " + err.Error())
return err
}
fw, err := w.CreateFormFile("sketch_hex", filePath)
if err != nil {
log.Println("Error creating form file")
return err
}
if _, err = io.Copy(fw, f); err != nil {
log.Println("Error copying form file")
return err
}
// Add the other fields
if fw, err = w.CreateFormField("board"); err != nil {
log.Println("Error creating form field")
return err
}
if _, err = fw.Write([]byte(colonToUnderscore(boardname))); err != nil {
log.Println("Error writing form field")
return err
}
// Don't forget to close the multipart writer.
// If you don't close it, your request will be missing the terminating boundary.
w.Close()
var cookies []*http.Cookie
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why does it need cookies?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you don't set a cookie from the 302 response, you keep on redirecting.

We need to discuss this behaviour with @facchinm.


for {
var b bytes.Buffer
w := multipart.NewWriter(&b)
// Add your image file
filePath = strings.Trim(filePath, "\n")
f, err := os.Open(filePath)
if err != nil {
log.Println("Error opening file" + filePath + " err: " + err.Error())
return err
}
fw, err := w.CreateFormFile("sketch_hex", filePath)
if err != nil {
log.Println("Error creating form file")
return err
}
if _, err = io.Copy(fw, f); err != nil {
log.Println("Error copying form file")
return err
}
// Add the other fields
if fw, err = w.CreateFormField("board"); err != nil {
log.Println("Error creating form field")
return err
}
if _, err = fw.Write([]byte(colonToUnderscore(boardname))); err != nil {
log.Println("Error writing form field")
return err
}
// Don't forget to close the multipart writer.
// If you don't close it, your request will be missing the terminating boundary.
w.Close()

// Now that you have a form, you can submit it to your handler.
req, err := http.NewRequest("POST", _url, &b)
if err != nil {
log.Println("Error creating post request")
return err
}
// Don't forget to set the content type, this will contain the boundary.
req.Header.Set("Content-Type", w.FormDataContentType())
if authdata.Username != "" {
req.SetBasicAuth(authdata.Username, authdata.Password)
}
// Now that you have a form, you can submit it to your handler.
req, err := http.NewRequest("POST", _url, &b)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This thing is indented weirdly: is it a github glitch?

if err != nil {
log.Println("Error creating post request")
return err
}
// Don't forget to set the content type, this will contain the boundary.
req.Header.Set("Content-Type", w.FormDataContentType())
if authdata.Username != "" {
req.SetBasicAuth(authdata.Username, authdata.Password)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

did you launch go fmt?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I think it is just how the diff is displayed. Everything is tabbed in one more level because of the loop for redirect retry.

}

//h.broadcastSys <- []byte("Start flashing with command " + cmdString)
log.Printf("Network flashing on " + portname)
mapD := map[string]string{"ProgrammerStatus": "Starting", "Cmd": "POST"}
mapB, _ := json.Marshal(mapD)
h.broadcastSys <- mapB
// set any cookies from the previous request
for _, cookie := range cookies {
req.AddCookie(cookie)
}

// Submit the request
client := &http.Client{}
res, err := client.Do(req)
if err != nil {
log.Println("Error during post request")
//h.broadcastSys <- []byte("Start flashing with command " + cmdString)
log.Printf("Network flashing on " + portname)
mapD := map[string]string{"ProgrammerStatus": "Starting", "Cmd": "POST"}
mapB, _ := json.Marshal(mapD)
h.broadcastSys <- mapB

// Submit the request
client := &http.Client{}
client.CheckRedirect = func(req *http.Request, via []*http.Request) error {
return errors.New("redirect")
}
res, err := client.Do(req)

// clear redirect errors and use status code
if err != nil && strings.HasSuffix(err.Error(), "redirect") {
err = nil
}

if err != nil {
log.Println("Error during post request")
return err
}

// check for found status
if res.StatusCode == http.StatusFound {
if urlStr := res.Header.Get("Location"); urlStr != "" {
// try redirect path
log.Printf("Got redirected to %s", urlStr)
_url = "http://" + portname + urlStr
cookies = res.Cookies()
continue
}
}

// Check the response
if res.StatusCode != http.StatusOK {
log.Errorf("bad status: %s", res.Status)
err = fmt.Errorf("bad status: %s", res.Status)
}
return err
}

// Check the response
if res.StatusCode != http.StatusOK {
log.Errorf("bad status: %s", res.Status)
err = fmt.Errorf("bad status: %s", res.Status)
}
return err
}

func spProgramLocal(portname string, boardname string, filePath string, commandline string, extraInfo boardExtraInfo) error {
Expand Down