Skip to content

Commit 121fa3c

Browse files
committed
Add a default cert and update nanobox-router
1 parent c72f282 commit 121fa3c

File tree

3 files changed

+17
-4
lines changed

3 files changed

+17
-4
lines changed

proxymgr/nanobox.go

+13
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
package proxymgr
44

55
import (
6+
"fmt"
7+
68
"github.com/jcelliott/lumber"
79
"github.com/nanobox-io/nanobox-router"
810

@@ -26,6 +28,13 @@ func (self Nanobox) Init() error {
2628
}
2729
config.Log.Info("Proxy listening at http://%s...", config.RouteHttp)
2830

31+
// set a default cert (*.nanoapp.io) self signed
32+
err = self.SetDefaultCert(core.CertBundle{Cert: "-----BEGIN CERTIFICATE-----\nMIIDnzCCAoegAwIBAgIJAMoiK3cYcT01MA0GCSqGSIb3DQEBCwUAMGYxCzAJBgNV\nBAYTAlVTMQ4wDAYDVQQIDAVJZGFobzEQMA4GA1UEBwwHUmV4YnVyZzEQMA4GA1UE\nCgwHTmFub2JveDEMMAoGA1UECwwDT3JnMRUwEwYDVQQDDAwqLm5hbm9hcHAuaW8w\nHhcNMTgwNDExMjIxNjEzWhcNMjgwNDA4MjIxNjEzWjBmMQswCQYDVQQGEwJVUzEO\nMAwGA1UECAwFSWRhaG8xEDAOBgNVBAcMB1JleGJ1cmcxEDAOBgNVBAoMB05hbm9i\nb3gxDDAKBgNVBAsMA09yZzEVMBMGA1UEAwwMKi5uYW5vYXBwLmlvMIIBIjANBgkq\nhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvKzIzdVw25whbmrFYLWg+D/xT0Smzli8\nc8vwXwcpx6XXcBcNdagAoxXy4zxjrYHkin0TxLJWNELNlBPkXt7GHJoe0/pbn9Iq\nnpJw1asi0VXGDO4ne+J7q+aUbpshpWG2NE9KEi1LFNfYnNLwvVkAylrmBLYXbdhN\nuWT164PtjEcT1mx3RNR4l8Zey3RgrBXp3y61ePFwPrHTM3t/AQixTPzU5UzArYJI\neEgFJe2cltuwLezLaXisR3IS42m3oBP1toAb6xM+wgznwQnByjCJy75658QGccJ9\npseIZBDYeArYDBcNUjW2Gp//vdDBRyYCn7bAJ9MHAOyHB50eWGLmMwIDAQABo1Aw\nTjAdBgNVHQ4EFgQUyMdlMFwMjKcBxPWC8vUhuQZ9iUYwHwYDVR0jBBgwFoAUyMdl\nMFwMjKcBxPWC8vUhuQZ9iUYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOC\nAQEALfJe6r2XD/93ZPNOhU6uyTvLkVKTIiE9E1NC5/bqhtHg8XVUR6kp2wwOH0Td\nMdop8XuhZDsZ5kGV9f8UA5s2Q2SFk9Nyu5gNmtVxVUrUb2yWwNmYVoxH+ntvthaK\nfH2lkgqXVQbFU5qYS+Vt4oxhb3ox0cxMkFJ5UsHzL2+8vZfzzL42g7WAolYOdXuo\nh+sLnKQfnqbYSdjyRGDu/uwyoZidrk7bZ2CQIIAKEF3kYDq29Y8zNRXKng83pS/3\nBx/nDgQW4+AAHm7YmfdbzcLLi4oW8lMb6fMW5DrOZ2pbfpSGGb6r1EVP8cHxLUso\n+nefsCWniPqS+FAxsXTxMvVLKA==\n-----END CERTIFICATE-----\n",
33+
Key: "-----BEGIN PRIVATE KEY-----\nMIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQC8rMjN1XDbnCFu\nasVgtaD4P/FPRKbOWLxzy/BfBynHpddwFw11qACjFfLjPGOtgeSKfRPEslY0Qs2U\nE+Re3sYcmh7T+luf0iqeknDVqyLRVcYM7id74nur5pRumyGlYbY0T0oSLUsU19ic\n0vC9WQDKWuYEthdt2E25ZPXrg+2MRxPWbHdE1HiXxl7LdGCsFenfLrV48XA+sdMz\ne38BCLFM/NTlTMCtgkh4SAUl7ZyW27At7MtpeKxHchLjabegE/W2gBvrEz7CDOfB\nCcHKMInLvnrnxAZxwn2mx4hkENh4CtgMFw1SNbYan/+90MFHJgKftsAn0wcA7IcH\nnR5YYuYzAgMBAAECggEAOiI+6PUIBhKQVnY9hLPR+kuxbYwonVHIFyHSWWVaoTJf\nNCFWO1ddguKDaTK1P8PTCDzLt4J/fzDKKQMMDZM0laGDOCteydq22Q8kByHo43k7\nQcarkcdR9cBhIcdY0Z1Ox8VafElKZgyvqHpyRNVEohTp5K+6flT0ddg+0adfrSW9\n7ilafXKX1976BQWeS2j5AUsaw9qWTMz/QhjYDvvYHsEG6rZFnUbQn+k65ubLOqG8\nYHj5z9Y7EZP/GfsByMgdyTLSnynz5ifzt05yeCUIEEhqsN1NZEMh8wfhzMCAnqYo\nRWujn5hayFmdZhXMiiBTSCUq52HPucOw5IXFfjnzSQKBgQDdNicOtx/o2j0QgzHo\ngB2tyieao+nlleQyK06xgRz/xjiRyObRuRpTYB1f6lyWKjwn5gdCnsj2JyUO0UAr\n7Xpc8suESyFbKBJ8QlYfagB72QN5k2NlxNE8kXSDruSS5Cu8N3OX025sFTuwiOhB\nmV3LU5VWvjcEs2T8goaMmGCV/QKBgQDaWLo8yvM19sc8z/3D4eQFcCQFlbz0/qPR\nPm8hWhd+U5KIKCKi4b03RnedJ8SSIHGM5JNKbsXVzCIOLOKq+eNCabYxI4TfgVWw\nIOXKOg9EdUdpHjf0V0kVFvl6bKcjkv/k51bVqjzeoeE8/iAiEWRmTNjyFVt3NXzB\nuncih2kL7wKBgQCIcUlf+zXUYx/9Gl7jQHqN4j3RVT8EnBKXmzy7oZ6oaLQlv5wX\nSaviN0uHCMA44y4dkfVycwwTQAvMeuaw8ZZi1GMRY2Hcnvff6u7CC5jmyvEowO8z\nK1W/nRwXyP01WUVcn3tN71yRj/s0JQ3UwGso6ZIYYdT/skMcuMmS2L3iZQKBgQCm\nb6Pm2zzxEZ9lt5XUTsglbQnISA+1ILV2toS3g5kM7l9v8kgUqMY28DwVS08HpDtq\nDoJH5pBfHC+JZqWRdtHIuhPq+Qw74raSf0EqGX+xy0QX2LUGR9KphM2+iDwPXeo5\nbi4+yHmFqxeqCnwr+93wLPvh7G3APMFQWvadF2L3eQKBgQC7zGqilReyuPleRkc6\nud4YweWzLov2IOK4JM/2c6AxzhRzuIMMDEPFbEGSIKPNSabclBf/kdqySYy/ZbGO\nnQ2Z+hPmCf7hfXZBGdEvR/WRkohQE6WdD7jKc2mYgQCIv8AR7yr9Bau4fs1LQLCc\nmm1hHKbUb5R8edPKixtXWKowLA==\n-----END PRIVATE KEY-----\n"})
34+
if err != nil {
35+
return fmt.Errorf("Failed to set default cert - %s", err.Error())
36+
}
37+
2938
// start https proxy
3039
err = router.StartTLS(config.RouteTls)
3140
if err != nil {
@@ -93,6 +102,10 @@ func (self Nanobox) SetCert(cert core.CertBundle) error {
93102
return self.SetCerts(self.keysToC(certs))
94103
}
95104

105+
func (self Nanobox) SetDefaultCert(cert core.CertBundle) error {
106+
return router.SetDefaultCert(cert.Cert, cert.Key)
107+
}
108+
96109
func (self Nanobox) DeleteCert(cert core.CertBundle) error {
97110
certs := router.Keys()
98111
for i := range certs {

vendor/vendor.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,10 @@
159159
"revisionTime": "2017-03-27T21:44:30Z"
160160
},
161161
{
162-
"checksumSHA1": "tR6Z3mP0/YiJCkYeMrRs+ReCKFE=",
162+
"checksumSHA1": "jDk3nWOJ65BvG565AOLya8kwH1s=",
163163
"path": "github.com/nanobox-io/nanobox-router",
164-
"revision": "947b635be433c75a0fd61a816a3c62bdcd0e1979",
165-
"revisionTime": "2018-01-10T23:16:57Z"
164+
"revision": "c2acc6938f802410c38560b6497d563dd615ae11",
165+
"revisionTime": "2018-04-17T20:25:58Z"
166166
},
167167
{
168168
"checksumSHA1": "65+hx0QlLzpWe5pnjAzteKBnC10=",

vipmgr/ip_fake.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
package vipmgr
55

66
import (
7-
"github.com/nanopack/portal/core"
87
"github.com/nanopack/portal/config"
8+
"github.com/nanopack/portal/core"
99
)
1010

1111
type ip struct{}

0 commit comments

Comments
 (0)