Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork158
fix: allow to specify customsignatureKey in theconfig.ini#1024
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.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes fromall commits
Commits
Show all changes
15 commits Select commitHold shift + click to select a range
a5be7b6 make the signaturePubKey overwritable
dido18dec684b Add debug logging for signature key parsing and handle newline escape…
dido185681091 Add MustParseRsaPublicKey function for parsing PEM formatted public keys
dido18497a640 Remove debug print statement for signature key and fix comment typo i…
dido180711750 Add error logging for command verification and update comment for pub…
dido18be54150 trigger
dido18bfcd135 fix(release.yml) install go step for gon
dido1841e5275 Merge branch 'main' into fix-invalid-signature-with-custom-keys
dido188a60882 refactor(main.go) remove unnecessary print statement in parseIni func…
dido189601bc0 implement suggestions
dido180f7a4fb Update v2/pkgs/tools.go
dido18d9348ca Update utilities/utilities.go
dido1827e570e Update main.go
dido1827b7ce7 refactor(utilities): improve formatting in ParseRsaPublicKey function
dido182237ff0 style(tools): align field declarations for improved readability
dido18File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
158 changes: 81 additions & 77 deletionsconn.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -19,6 +19,7 @@ package main | ||
| import ( | ||
| "bytes" | ||
| "crypto/rsa" | ||
| "encoding/json" | ||
| "errors" | ||
| "fmt" | ||
| @@ -79,111 +80,114 @@ type Upload struct { | ||
| var uploadStatusStr = "ProgrammerStatus" | ||
| func uploadHandler(pubKey *rsa.PublicKey) func(*gin.Context) { | ||
| return func(c *gin.Context) { | ||
| data := new(Upload) | ||
| if err := c.BindJSON(data); err != nil { | ||
| c.String(http.StatusBadRequest, fmt.Sprintf("err with the payload. %v", err.Error())) | ||
| return | ||
| } | ||
| log.Printf("%+v %+v %+v %+v %+v %+v", data.Port, data.Board, data.Rewrite, data.Commandline, data.Extra, data.Filename) | ||
| if data.Port == "" { | ||
| c.String(http.StatusBadRequest, "port is required") | ||
| return | ||
| } | ||
| if data.Board == "" { | ||
| c.String(http.StatusBadRequest, "board is required") | ||
| log.Error("board is required") | ||
| return | ||
| } | ||
| if !data.Extra.Network { | ||
| if data.Signature == "" { | ||
| c.String(http.StatusBadRequest, "signature is required") | ||
| return | ||
| } | ||
| if data.Commandline == "" { | ||
| c.String(http.StatusBadRequest, "commandline is required for local board") | ||
| return | ||
| } | ||
| err := utilities.VerifyInput(data.Commandline, data.Signature, pubKey) | ||
| if err != nil { | ||
| log.WithField("err", err).Error("Error verifying the command") | ||
| c.String(http.StatusBadRequest, "signature is invalid") | ||
| return | ||
| } | ||
| } | ||
| buffer := bytes.NewBuffer(data.Hex) | ||
| filePath,err:= utilities.SaveFileonTempDir(data.Filename, buffer) | ||
| if err != nil { | ||
| c.String(http.StatusBadRequest, err.Error()) | ||
| return | ||
| } | ||
| tmpdir, err := os.MkdirTemp("", "extrafiles") | ||
| if err != nil { | ||
| c.String(http.StatusBadRequest,err.Error()) | ||
| return | ||
| } | ||
| for _, extraFile := range data.ExtraFiles { | ||
| path, err := utilities.SafeJoin(tmpdir, extraFile.Filename) | ||
| if err != nil { | ||
| c.String(http.StatusBadRequest, err.Error()) | ||
| return | ||
| } | ||
| log.Printf("Saving %s on %s", extraFile.Filename, path) | ||
| err = os.MkdirAll(filepath.Dir(path), 0744) | ||
| ||
| if err != nil { | ||
| c.String(http.StatusBadRequest, err.Error()) | ||
| return | ||
| } | ||
| err = os.WriteFile(path, extraFile.Hex, 0644) | ||
| ||
| if err != nil { | ||
| c.String(http.StatusBadRequest, err.Error()) | ||
| return | ||
| } | ||
| } | ||
| if data.Rewrite != "" { | ||
| data.Board = data.Rewrite | ||
| } | ||
| go func() { | ||
| // Resolve commandline | ||
| commandline, err := upload.PartiallyResolve(data.Board, filePath, tmpdir, data.Commandline, data.Extra, Tools) | ||
| if err != nil { | ||
| send(map[string]string{uploadStatusStr: "Error", "Msg": err.Error()}) | ||
| return | ||
| } | ||
| l := PLogger{Verbose: true} | ||
| // Upload | ||
| if data.Extra.Network { | ||
| err = errors.New("network upload is not supported anymore, pease use OTA instead") | ||
| } else { | ||
| send(map[string]string{uploadStatusStr: "Starting", "Cmd": "Serial"}) | ||
| err = upload.Serial(data.Port, commandline, data.Extra, l) | ||
| } | ||
| // Handle result | ||
| if err != nil { | ||
| send(map[string]string{uploadStatusStr: "Error", "Msg": err.Error()}) | ||
| return | ||
| } | ||
| send(map[string]string{uploadStatusStr: "Done", "Flash": "Ok"}) | ||
| }() | ||
| c.String(http.StatusAccepted, "") | ||
| } | ||
| } | ||
| // PLogger sends the info from the upload to the websocket | ||
13 changes: 10 additions & 3 deletionsglobals/globals.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
16 changes: 12 additions & 4 deletionsmain.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
10 changes: 6 additions & 4 deletionsmain_test.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
6 changes: 4 additions & 2 deletionstools/download_test.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
5 changes: 3 additions & 2 deletionstools/tools.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.