From 279de6a1195adb739a8d1f2afb445b68793b28b8 Mon Sep 17 00:00:00 2001 From: Rasmus Dahlberg Date: Sun, 2 Jun 2024 08:29:49 +0200 Subject: chore: Remove dash in project name To be consistent with naming of the tools in cmd/. --- AUTHORS | 8 ++++---- LICENSE | 2 +- README.md | 6 +++--- cmd/silentct-mac/examples.help2man | 2 +- cmd/silentct-mac/main.go | 12 ++++++------ cmd/silentct-mon/examples.help2man | 2 +- cmd/silentct-mon/main.go | 14 +++++++------- docs/help2man/reporting-bugs.help2man | 2 +- docs/submission.md | 4 ++-- go.mod | 2 +- internal/feedback/feedback.go | 8 ++++---- internal/logutil/logutil.go | 2 +- internal/manager/manager.go | 10 +++++----- internal/monitor/monitor.go | 4 ++-- internal/monitor/tail.go | 4 ++-- pkg/policy/node.go | 2 +- pkg/policy/wildcard.go | 2 +- pkg/storage/index/index.go | 6 +++--- pkg/storage/index/inmem.go | 2 +- pkg/storage/loglist/loglist.go | 2 +- pkg/storage/storage.go | 12 ++++++------ pkg/submission/submission.go | 4 ++-- 22 files changed, 56 insertions(+), 56 deletions(-) diff --git a/AUTHORS b/AUTHORS index db11e83..72f618d 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,13 +1,13 @@ -Authors of silent-ct +Authors of silentct -The copyright on silent-ct is held by the respective authors. Unless -file-specific copyright headers say otherwise, silent-ct is permissively +The copyright on silentct is held by the respective authors. Unless +file-specific copyright headers say otherwise, silentct is permissively licensed according to the BSD 2-Clause License. See the LICENSE file. This file contains only a summary. For fine-grained information on who authored a particular file or feature, please refer to the version control history at: - https://git.glasklar.is/rgdd/silent-ct + https://git.glasklar.is/rgdd/silentct File-specific copyright headers should be used when necessary to document the origin of a file's contents, e.g., for code copied from other sources or which diff --git a/LICENSE b/LICENSE index 65193a9..c29872a 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ BSD 2-Clause License -Copyright (c) 2023, silent-ct authors +Copyright (c) 2023, silentct authors All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/README.md b/README.md index eb0e74d..ef27a10 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# silent-ct +# silentct An implementation of a silent Certificate Transparency monitor. @@ -28,7 +28,7 @@ certificate is found that no node submitted, only then is an alert printed. You will need the `silentct-mac` tool to create submissions that the monitor can pull. Install: - $ go install rgdd.se/silent-ct/cmd/silentct-mac@latest + $ go install rgdd.se/silentct/cmd/silentct-mac@latest Locate the node's certificates that are still valid (i.e., not expired) and prepare a submission for them: @@ -56,7 +56,7 @@ Repeat this setup if there are multiple nodes. Install on the system that will run the monitor: - $ go install rgdd.se/silent-ct/cmd/silentct-mon@latest + $ go install rgdd.se/silentct/cmd/silentct-mon@latest Create a monitor policy file in JSON format. Below is an example that looks for all certificates related to `example.org`, expect for certificates that are diff --git a/cmd/silentct-mac/examples.help2man b/cmd/silentct-mac/examples.help2man index f7bbff5..378a491 100644 --- a/cmd/silentct-mac/examples.help2man +++ b/cmd/silentct-mac/examples.help2man @@ -1,6 +1,6 @@ [EXAMPLES] Allowlist the current certificate in a Let's Encrypt deployment: -.B $ silentct-mac -n example.org -s sikritpassword -o /var/www/example.org/silent-ct/allowlist /etc/letsencrypt/live/example.org/fullchain.pem +.B $ silentct-mac -n example.org -s sikritpassword -o /var/www/example.org/silentct/allowlist /etc/letsencrypt/live/example.org/fullchain.pem You may run the above as part of your crontab or certbot renewal configuration. diff --git a/cmd/silentct-mac/main.go b/cmd/silentct-mac/main.go index 2add812..0295834 100644 --- a/cmd/silentct-mac/main.go +++ b/cmd/silentct-mac/main.go @@ -7,12 +7,12 @@ import ( "os" "strings" - "rgdd.se/silent-ct/internal/flagopt" - "rgdd.se/silent-ct/internal/ioutil" - "rgdd.se/silent-ct/internal/logger" - "rgdd.se/silent-ct/pkg/crtutil" - "rgdd.se/silent-ct/pkg/policy" - "rgdd.se/silent-ct/pkg/submission" + "rgdd.se/silentct/internal/flagopt" + "rgdd.se/silentct/internal/ioutil" + "rgdd.se/silentct/internal/logger" + "rgdd.se/silentct/pkg/crtutil" + "rgdd.se/silentct/pkg/policy" + "rgdd.se/silentct/pkg/submission" ) const usage = ` diff --git a/cmd/silentct-mon/examples.help2man b/cmd/silentct-mon/examples.help2man index 3fc76ff..33cb583 100644 --- a/cmd/silentct-mon/examples.help2man +++ b/cmd/silentct-mon/examples.help2man @@ -16,7 +16,7 @@ A basic configuration is shown below. { "name": "example.org", "secret": "sikritpassword", - "url": "https://www.example.org/silent-ct/allowlist", + "url": "https://www.example.org/silentct/allowlist", "issues": [ "example.org", "www.example.org" diff --git a/cmd/silentct-mon/main.go b/cmd/silentct-mon/main.go index 2cb325a..e2ecdb7 100644 --- a/cmd/silentct-mon/main.go +++ b/cmd/silentct-mon/main.go @@ -13,13 +13,13 @@ import ( "syscall" "time" - "rgdd.se/silent-ct/internal/feedback" - "rgdd.se/silent-ct/internal/flagopt" - "rgdd.se/silent-ct/internal/ioutil" - "rgdd.se/silent-ct/internal/logger" - "rgdd.se/silent-ct/internal/manager" - "rgdd.se/silent-ct/internal/monitor" - "rgdd.se/silent-ct/pkg/policy" + "rgdd.se/silentct/internal/feedback" + "rgdd.se/silentct/internal/flagopt" + "rgdd.se/silentct/internal/ioutil" + "rgdd.se/silentct/internal/logger" + "rgdd.se/silentct/internal/manager" + "rgdd.se/silentct/internal/monitor" + "rgdd.se/silentct/pkg/policy" ) const usage = ` diff --git a/docs/help2man/reporting-bugs.help2man b/docs/help2man/reporting-bugs.help2man index 893bb0f..81a4147 100644 --- a/docs/help2man/reporting-bugs.help2man +++ b/docs/help2man/reporting-bugs.help2man @@ -1,6 +1,6 @@ [REPORTING BUGS] Use -.B https://git.glasklar.is/rgdd/silent-ct/-/issues +.B https://git.glasklar.is/rgdd/silentct/-/issues for filing issues. .br Reach out to diff --git a/docs/submission.md b/docs/submission.md index 357f07a..1d9c189 100644 --- a/docs/submission.md +++ b/docs/submission.md @@ -6,7 +6,7 @@ docdoc NAME MAC - silent-ct:separator + silentct:separator ... @@ -15,7 +15,7 @@ docdoc `MAC`: HMAC with SHA256 as the hash function, computed for line two and forward. The HMAC key is derived by the node and the monitor from their shared secret: - hkdf := hkdf.New(sha256.New, SECRET, []byte("silent-ct"), NAME) + hkdf := hkdf.New(sha256.New, SECRET, []byte("silentct"), NAME) key := make([]byte, 16) io.ReadFull(hkdf, key) diff --git a/go.mod b/go.mod index ab99187..28b31f7 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module rgdd.se/silent-ct +module rgdd.se/silentct go 1.19 diff --git a/internal/feedback/feedback.go b/internal/feedback/feedback.go index 1446312..b191f05 100644 --- a/internal/feedback/feedback.go +++ b/internal/feedback/feedback.go @@ -8,10 +8,10 @@ import ( "os" "time" - "rgdd.se/silent-ct/internal/logger" - "rgdd.se/silent-ct/pkg/crtutil" - "rgdd.se/silent-ct/pkg/policy" - "rgdd.se/silent-ct/pkg/submission" + "rgdd.se/silentct/internal/logger" + "rgdd.se/silentct/pkg/crtutil" + "rgdd.se/silentct/pkg/policy" + "rgdd.se/silentct/pkg/submission" ) type Event struct { diff --git a/internal/logutil/logutil.go b/internal/logutil/logutil.go index 27c3a73..fd600f0 100644 --- a/internal/logutil/logutil.go +++ b/internal/logutil/logutil.go @@ -13,7 +13,7 @@ import ( "github.com/transparency-dev/merkle/compact" "github.com/transparency-dev/merkle/rfc6962" "gitlab.torproject.org/rgdd/ct/pkg/merkle" - "rgdd.se/silent-ct/internal/ioutil" + "rgdd.se/silentct/internal/ioutil" ) const timeout = 10 * time.Second diff --git a/internal/manager/manager.go b/internal/manager/manager.go index ce31b1b..6781d57 100644 --- a/internal/manager/manager.go +++ b/internal/manager/manager.go @@ -8,11 +8,11 @@ import ( "time" "gitlab.torproject.org/rgdd/ct/pkg/metadata" - "rgdd.se/silent-ct/internal/feedback" - "rgdd.se/silent-ct/internal/logger" - "rgdd.se/silent-ct/internal/monitor" - "rgdd.se/silent-ct/pkg/policy" - "rgdd.se/silent-ct/pkg/storage" + "rgdd.se/silentct/internal/feedback" + "rgdd.se/silentct/internal/logger" + "rgdd.se/silentct/internal/monitor" + "rgdd.se/silentct/pkg/policy" + "rgdd.se/silentct/pkg/storage" ) type Config struct { diff --git a/internal/monitor/monitor.go b/internal/monitor/monitor.go index 2fe4d88..ffe7f75 100644 --- a/internal/monitor/monitor.go +++ b/internal/monitor/monitor.go @@ -23,7 +23,7 @@ import ( "github.com/google/certificate-transparency-go/client" "github.com/google/certificate-transparency-go/jsonclient" "gitlab.torproject.org/rgdd/ct/pkg/metadata" - "rgdd.se/silent-ct/internal/logger" + "rgdd.se/silentct/internal/logger" ) // MonitoredLog provides information about a log the monitor is following @@ -148,7 +148,7 @@ func (mon *Monitor) RunForever(ctx context.Context) error { } } -const userAgentPrefix = "rgdd.se/silent-ct" +const userAgentPrefix = "rgdd.se/silentct" func (mon *Monitor) newTailRFC6962(log MonitoredLog) (tail, error) { key, err := x509.MarshalPKIXPublicKey(log.Config.Key.Public) diff --git a/internal/monitor/tail.go b/internal/monitor/tail.go index 6be165b..d00ebe6 100644 --- a/internal/monitor/tail.go +++ b/internal/monitor/tail.go @@ -8,8 +8,8 @@ import ( "github.com/google/certificate-transparency-go/client" "github.com/google/certificate-transparency-go/scanner" "gitlab.torproject.org/rgdd/ct/pkg/merkle" - "rgdd.se/silent-ct/internal/ioutil" - "rgdd.se/silent-ct/internal/logutil" + "rgdd.se/silentct/internal/ioutil" + "rgdd.se/silentct/internal/logutil" ) type tail struct { diff --git a/pkg/policy/node.go b/pkg/policy/node.go index 23f04ca..607dbc3 100644 --- a/pkg/policy/node.go +++ b/pkg/policy/node.go @@ -84,7 +84,7 @@ func (n *Node) HMAC(data []byte) (mac [sha256.Size]byte, err error) { } func (n *Node) deriveKey() error { - const salt = "silent-ct" + const salt = "silentct" hkdf := hkdf.New(sha256.New, []byte(n.Secret), []byte(salt), []byte(n.Name)) _, err := io.ReadFull(hkdf, n.key[:]) diff --git a/pkg/policy/wildcard.go b/pkg/policy/wildcard.go index abea841..c67e1d9 100644 --- a/pkg/policy/wildcard.go +++ b/pkg/policy/wildcard.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "rgdd.se/silent-ct/pkg/crtutil" + "rgdd.se/silentct/pkg/crtutil" ) // Wildcards implement the monitor.Matcher interface for a list of wildcards. diff --git a/pkg/storage/index/index.go b/pkg/storage/index/index.go index ef9ad60..36a9334 100644 --- a/pkg/storage/index/index.go +++ b/pkg/storage/index/index.go @@ -8,9 +8,9 @@ import ( "fmt" "time" - "rgdd.se/silent-ct/internal/ioutil" - "rgdd.se/silent-ct/internal/monitor" - "rgdd.se/silent-ct/pkg/crtutil" + "rgdd.se/silentct/internal/ioutil" + "rgdd.se/silentct/internal/monitor" + "rgdd.se/silentct/pkg/crtutil" ) type Config struct { diff --git a/pkg/storage/index/inmem.go b/pkg/storage/index/inmem.go index 0a084bf..ba48bc1 100644 --- a/pkg/storage/index/inmem.go +++ b/pkg/storage/index/inmem.go @@ -6,7 +6,7 @@ import ( "time" "github.com/google/certificate-transparency-go/x509" - "rgdd.se/silent-ct/pkg/crtutil" + "rgdd.se/silentct/pkg/crtutil" ) type CertificateID string diff --git a/pkg/storage/loglist/loglist.go b/pkg/storage/loglist/loglist.go index ccc63b0..a37cb32 100644 --- a/pkg/storage/loglist/loglist.go +++ b/pkg/storage/loglist/loglist.go @@ -8,7 +8,7 @@ import ( "time" "gitlab.torproject.org/rgdd/ct/pkg/metadata" - "rgdd.se/silent-ct/internal/ioutil" + "rgdd.se/silentct/internal/ioutil" ) type Config struct { diff --git a/pkg/storage/storage.go b/pkg/storage/storage.go index afd0bf0..a06a10e 100644 --- a/pkg/storage/storage.go +++ b/pkg/storage/storage.go @@ -17,12 +17,12 @@ import ( "github.com/google/certificate-transparency-go/jsonclient" "github.com/transparency-dev/merkle/compact" "gitlab.torproject.org/rgdd/ct/pkg/metadata" - "rgdd.se/silent-ct/internal/ioutil" - "rgdd.se/silent-ct/internal/logger" - "rgdd.se/silent-ct/internal/logutil" - "rgdd.se/silent-ct/internal/monitor" - "rgdd.se/silent-ct/pkg/storage/index" - "rgdd.se/silent-ct/pkg/storage/loglist" + "rgdd.se/silentct/internal/ioutil" + "rgdd.se/silentct/internal/logger" + "rgdd.se/silentct/internal/logutil" + "rgdd.se/silentct/internal/monitor" + "rgdd.se/silentct/pkg/storage/index" + "rgdd.se/silentct/pkg/storage/loglist" ) type Config struct { diff --git a/pkg/submission/submission.go b/pkg/submission/submission.go index d33a49d..cd0214e 100644 --- a/pkg/submission/submission.go +++ b/pkg/submission/submission.go @@ -14,11 +14,11 @@ import ( "fmt" "strings" - "rgdd.se/silent-ct/pkg/policy" + "rgdd.se/silentct/pkg/policy" ) const ( - Separator = "silent-ct:separator\n" + Separator = "silentct:separator\n" ) type Submission []byte -- cgit v1.2.3