Skip to content

Build the Observatory using Go 1.11 #288

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 our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ jobs:
build:
working_directory: /go/src/github.com/mozilla/tls-observatory
docker:
- image: circleci/golang:1.9
- image: nvor/circleci:4458a35
- image: circleci/postgres:9.6-alpine
environment:
POSTGRES_USER: postgres
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:latest
FROM nvor/golang:4458a35
Copy link
Contributor

Choose a reason for hiding this comment

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

Sorry but I still don't want to use an unofficial container hosted in your account as the base. I'm trying to import the needed code into the main docker and continue depending on golang:latest in #343

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yup, that's fine. It's exactly why I linked you the gists of how these were made. =)

MAINTAINER Julien Vehent
COPY . $GOPATH/src/github.com/mozilla/tls-observatory

Expand Down Expand Up @@ -31,4 +31,4 @@ RUN addgroup -gid 10001 app && \
ln -s $GOPATH/src/github.com/mozilla/tls-observatory/cipherscan /opt/cipherscan

WORKDIR /app
USER app
USER app
2 changes: 1 addition & 1 deletion tlsobs-runner/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ func (r Run) evaluate(id int64, notifchan chan Notification, wg *sync.WaitGroup)
func getCert(id int64) (cert certificate.Certificate, err error) {
defer func() {
if e := recover(); e != nil {
err = fmt.Errorf("getCert(id=%q) -> %v", cert.ID, e)
err = fmt.Errorf("getCert(id=%q) -> %v", id, e)
}
}()
resp, err := http.Get(fmt.Sprintf("%s/api/v1/certificate?id=%d", observatory, id))
Expand Down
3 changes: 2 additions & 1 deletion worker/mozillaEvaluationWorker/mozillaEvaluationWorker.go
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,8 @@ func isBad(c connection.Stored, cert certificate.Certificate) (bool, []string) {
}

if cert.SignatureAlgorithm == "UnknownSignatureAlgorithm" {
failures = append(failures, "certificate signature could not be determined, use a standard algorithm")
failures = append(failures,
fmt.Sprintf("certificate signature could not be determined, use a standard algorithm, got %v", cert.SignatureAlgorithm))
isBad = true
} else if _, ok := sigAlgTranslation[cert.SignatureAlgorithm]; !ok {
failures = append(failures,
Expand Down