Commit a8b2fc5
committed
Augment system cert pool instead of replacing it
When a CA bundle is provided, use x509.SystemCertPool() as the base and
append the custom certificates to it. Previously x509.NewCertPool() was
used, which created an empty pool containing only the custom CA. This
caused TLS verification to fail for public HTTPS endpoints (e.g. GitHub)
when the gitjob was configured with a Rancher CA bundle, because the
required public root CA was not in the pool.
The fix matches go-git's own transportWithCABundle behavior.1 parent 06074e8 commit a8b2fc5
2 files changed
Lines changed: 12 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
66 | 66 | | |
67 | 67 | | |
68 | 68 | | |
69 | | - | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
70 | 73 | | |
71 | 74 | | |
72 | 75 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
41 | 41 | | |
42 | 42 | | |
43 | 43 | | |
44 | | - | |
45 | | - | |
46 | | - | |
47 | | - | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
48 | 48 | | |
49 | 49 | | |
50 | 50 | | |
| |||
58 | 58 | | |
59 | 59 | | |
60 | 60 | | |
61 | | - | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
62 | 65 | | |
63 | 66 | | |
64 | 67 | | |
| |||
0 commit comments