refactor http API handler, add test #199
Merged
Conversation
This file contains 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
Collaborator
vixentael
commented
Jul 12, 2018
vixentael
commented
- add tests for HTTP response codes
- refactor HTTP handler into smaller functions
Lagovas
requested changes
Jul 12, 2018
cmd/acra-reader/server.go
Outdated
| if zoneId != nil { | ||
| privateKey, err = server.keystorage.GetZonePrivateKey(zoneId) | ||
| } else { | ||
| privateKey, err = server.keystorage.GetZonePrivateKey(clientId) |
There was a problem hiding this comment.
GetZonePrivateKey -> GetServerDecryptionPrivateKey
cmd/acra-reader/server.go
Outdated
| } | ||
|
|
||
|
|
||
| func (server *ReaderServer) closeConnectionAndSendResponse(logger *log.Entry, response *http.Response, connection net.Conn) { |
There was a problem hiding this comment.
rename to sendResponseAndCloseConnection ?)
cmd/acra-reader/server.go
Outdated
| logger.WithError(err).WithField(logging.FieldKeyEventCode, logging.EventCodeErrorReaderCantReturnResponse). | ||
| Warningln("Can't write response to HTTP request") | ||
| } else { | ||
| connection.Write(buf.Bytes()) |
cmd/acra-reader/server.go
Outdated
| connection.Write(buf.Bytes()) | ||
| } | ||
|
|
||
| connection.Close() |
cmd/acra-reader/acra-reader_test.go
Outdated
| request.URL, _ = url.Parse("http://smth.com/v1/decrypt?zone_id=\"somezoneid\"") | ||
| request.Body = ioutil.NopCloser(bytes.NewBufferString("bla bla bla body")) | ||
| res = readerServer.parseRequestPrepareResponse(logger, &request, []byte("asdf")) | ||
| if res.StatusCode != http.StatusUnprocessableEntity { |
There was a problem hiding this comment.
check decryption success request too?)
There was a problem hiding this comment.
it depends on keystorage, masterkey and folders. is there any way to mock keystorage behaviour (to override getting private keys functiont)
There was a problem hiding this comment.
is it ok to use https://github.com/golang/mock?
There was a problem hiding this comment.
it's just interface and you can add simple as you need implementation for tests (example https://github.com/cossacklabs/acra/pull/200/files#diff-2a5db1c46f9ea9f86e34328a7bbc0dc6R13)
cmd/acra-reader/server.go
Outdated
| } | ||
|
|
||
| // /v1/decrypt | ||
| // /, v1, decrypt | ||
| pathParts := strings.Split(request.URL.Path, string(os.PathSeparator)) | ||
| if len(pathParts) != 3 { | ||
| logger.WithError(err).WithField(logging.FieldKeyEventCode, logging.EventCodeErrorReaderMalformedURL). | ||
| logger.WithField(logging.FieldKeyEventCode, logging.EventCodeErrorReaderMalformedURL). | ||
| Warningf("Malformed URL, expected /<version>/<endpoint>, got %s", request.URL.Path) |
There was a problem hiding this comment.
can we place this explanation to response body to simplify understanding of errors by clients?
Lagovas
approved these changes
Jul 13, 2018
vixentael
added a commit
that referenced
this pull request
Jul 23, 2018
* acra reader: entry point * deadline listener; refactor acra-server * base part of connection handling (#197) * base part of connection handling * save connections by descriptor * add a little bit graceful stop service * basic http /decrypt handle (#198) * refactor http API handler, add test (#199) * refactor http API handler, add test * validate acrastruct length before decryption (#201) * add more errors checking * copy keys in test keystorage, add tests on encryption * move into separate folder; add http message responses in body * grpc handler (#200) * change sign of comparison key length * base part of connection handling * save connections by descriptor * add a little bit graceful stop service * add grpc service * fix log message * fix import path * add missing file * validate acrastruct length before decryption * add api test * drop old method fill with zeroes private key * verbose go get * rename api -> grpc_api * fix network part (#203) * fix accepting connections, network manager * drop comment * AcraReader http buffering (#204) * fixing http handling * close connection, remove buffers for http response * add more logs to decryptor * move defer to the top * acra-reader -> acra-translator renaming (#205) * acra-reader -> acra-translator * re-gen api.pb.go * rm old file * Update AcraConnector to connect with AcraTranslator (#206) * acra-reader -> acra-translator * re-gen api.pb.go * add separate acra-translator keys * simplify keys check * acra reader integration tests [T663] (#207) * integration tests for grpc/http * refactor serializing http response struct * check response codes and messages in tests * compare all messages in lower case * add translator keystore move filesystem keystore to separate package run translator with own transport keys * fix import in unit test * return error code after failed creation of posion record * drop keys folder before tests * set Connection: close header to http response * optimize response sending * deadline for secure session handshake timeout for http requests in tests * refactor tests of acra-connector shutdown * detect poison record on translator (#212) * check poison records on acra-translator * change path to test master key * update log messages
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.