ooni / netem

83%

main: 84%

LAST BUILD ON BRANCH issue/1803

branch: issue/1803

CHANGE BRANCH

x

Reset

Sync Branches

• issue/1803
• architecture
• chore/upgrade-go1.23
• cleanups
• cov2
• coverage
• debug/dpi
• dnsspoof
• fix/cname
• fixes
• fixtests
• issue-2464
• issue/2029
• issue/2461
• issue/2494
• issue/2531
• issue/2556
• issue/2654
• issue/2669e
• main
• moredocs
• moretests
• other_docs
• perf
• quicparse
• racedetect
• updatedeps

Build # 6095017614

Build Type

Pull #37

github

Committed by bassosimone

Commit Message

feat: fork google/martian/v3/mitm to build expired certs

To move forward with https://github.com/ooni/probe/issues/1803, I want to
generate expired certificates. To this end, I have forked the mitm package
to peek into internals and further customize certificate generation.

I forked at https://github.com/google/martian/commit/19163e1b8.

The diff between the original code and my code is the following:

```diff
--- mitmx/mitm.go.orig	2023-09-06 10:42:30
+++ mitmx/mitmx.go	2023-09-06 10:46:28
@@ -12,10 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-// Package mitm provides tooling for MITMing TLS connections. It provides
+// Package mitmx provides tooling for MITMing TLS connections. It provides
 // tooling to create CA certs and generate TLS configs that can be used to MITM
 // a TLS connection with a provided CA certificate.
-package mitm
+//
+// This package is a fork of the mitm package in github.com/google/martian/v3.
+package mitmx

 import (
 	"bytes"
@@ -51,7 +53,6 @@
 	validity               time.Duration
 	org                    string
 	h2Config               *h2.Config
-	getCertificate         func(*tls.ClientHelloInfo) (*tls.Certificate, error)
 	roots                  *x509.CertPool
 	skipVerify             bool
 	handshakeErrorCallback func(*http.Request, error)
@@ -63,6 +64,12 @@
 // NewAuthority creates a new CA certificate and associated
 // private key.
 func NewAuthority(name, organization string, validity time.Duration) (*x509.Certificate, *rsa.PrivateKey, error) {
+	return NewAuthorityWithTimeNow(name, organization, validity, time.Now)
+}
+
+// NewAuthorityWithTimeNow is like NewAuthority but allows to customize the time.Now func
+func NewAuthorityWithTimeNow(
+	name, organization string, validity time.Duration, timeNow func() time.Time) (*x509.Certificate, *rsa.PrivateKey, error) {
 	priv, err := rsa.GenerateKey(rand.Reader, 20... (continued)

Pull Request Pull Request #37: feat: fork google/martian/v3/mitm to build expired certs

Run Details

171 of 209 new or added lines in 3 files covered. (81.82%)

3 existing lines in 1 file now uncovered.

2476 of 2987 relevant lines covered (82.89%)

0.88 hits per line