github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-08-14 10:46:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

new: single https certificate / authority fields can now be customized via dedicated module parameters ( http.server, https.proxy and api.rest )

Browse source
This commit is contained in:
evilsocket 2018-08-17 14:11:50 +02:00
commit 7a08366516
No known key found for this signature in database
GPG key ID: 1564D7F30393A456
4 changed files with 123 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

114
tls/cert.go
View file

@ -8,25 +8,76 @@ import (
"encoding/pem"
"math/big"
"os"
"strconv"
"time"
"github.com/bettercap/bettercap/session"
)
func Generate(certPath string, keyPath string) error {
keyfile, err := os.Create(keyPath)
if err != nil {
return err
}
defer keyfile.Close()
type CertConfig struct {
Bits int
Country string
Locality string
Organization string
OrganizationalUnit string
CommonName string
}
certfile, err := os.Create(certPath)
if err != nil {
return err
var (
DefaultLegitConfig = CertConfig{
Bits: 4096,
Country: "US",
Locality: "",
Organization: "bettercap devteam",
OrganizationalUnit: "https://bettercap.org/",
CommonName: "bettercap",
}
defer certfile.Close()
DefaultSpoofConfig = CertConfig{
Bits: 4096,
Country: "US",
Locality: "Scottsdale",
Organization: "GoDaddy.com, Inc.",
OrganizationalUnit: "https://certs.godaddy.com/repository/",
CommonName: "Go Daddy Secure Certificate Authority - G2",
}
)
priv, err := rsa.GenerateKey(rand.Reader, 4096)
func CertConfigToModule(prefix string, m *session.SessionModule, defaults CertConfig) {
m.AddParam(session.NewIntParameter(prefix+".certificate.bits", strconv.Itoa(defaults.Bits),
"Number of bits of the RSA private key of the generated HTTPS certificate."))
m.AddParam(session.NewStringParameter(prefix+".certificate.country", defaults.Country, ".*",
"Country field of the generated HTTPS certificate."))
m.AddParam(session.NewStringParameter(prefix+".certificate.locality", defaults.Locality, ".*",
"Locality field of the generated HTTPS certificate."))
m.AddParam(session.NewStringParameter(prefix+".certificate.organization", defaults.Organization, ".*",
"Organization field of the generated HTTPS certificate."))
m.AddParam(session.NewStringParameter(prefix+".certificate.organizationalunit", defaults.OrganizationalUnit, ".*",
"Organizational Unit field of the generated HTTPS certificate."))
m.AddParam(session.NewStringParameter(prefix+".certificate.commonname", defaults.CommonName, ".*",
"Common Name field of the generated HTTPS certificate."))
}
func CertConfigFromModule(prefix string, m session.SessionModule) (err error, cfg CertConfig) {
if err, cfg.Bits = m.IntParam(prefix + ".certificate.bits"); err != nil {
return err, cfg
} else if err, cfg.Country = m.StringParam(prefix + ".certificate.country"); err != nil {
return err, cfg
} else if err, cfg.Locality = m.StringParam(prefix + ".certificate.locality"); err != nil {
return err, cfg
} else if err, cfg.Organization = m.StringParam(prefix + ".certificate.organization"); err != nil {
return err, cfg
} else if err, cfg.OrganizationalUnit = m.StringParam(prefix + ".certificate.organizationalunit"); err != nil {
return err, cfg
} else if err, cfg.CommonName = m.StringParam(prefix + ".certificate.commonname"); err != nil {
return err, cfg
}
return nil, cfg
}
func CreateCertificate(cfg CertConfig) (error, *rsa.PrivateKey, []byte) {
priv, err := rsa.GenerateKey(rand.Reader, cfg.Bits)
if err != nil {
return err
return err, nil, nil
}
notBefore := time.Now()
@ -35,17 +86,17 @@ func Generate(certPath string, keyPath string) error {
serialNumberLimit := new(big.Int).Lsh(big.NewInt(1), 128)
serialNumber, err := rand.Int(rand.Reader, serialNumberLimit)
if err != nil {
return err
return err, nil, nil
}
template := x509.Certificate{
SerialNumber: serialNumber,
Subject: pkix.Name{
Country: []string{"US"},
Locality: []string{"Scottsdale"},
Organization: []string{"GoDaddy.com, Inc."},
OrganizationalUnit: []string{"https://certs.godaddy.com/repository/"},
CommonName: "Go Daddy Secure Certificate Authority - G2",
Country: []string{cfg.Country},
Locality: []string{cfg.Locality},
Organization: []string{cfg.Organization},
OrganizationalUnit: []string{cfg.OrganizationalUnit},
CommonName: cfg.CommonName,
},
NotBefore: notBefore,
NotAfter: notAfter,
@ -55,14 +106,35 @@ func Generate(certPath string, keyPath string) error {
IsCA: true,
}
cert_raw, err := x509.CreateCertificate(rand.Reader, &template, &template, &priv.PublicKey, priv)
cert, err := x509.CreateCertificate(rand.Reader, &template, &template, &priv.PublicKey, priv)
if err != nil {
return err, nil, nil
}
return nil, priv, cert
}
func Generate(cfg CertConfig, certPath string, keyPath string) error {
keyFile, err := os.Create(keyPath)
if err != nil {
return err
}
defer keyFile.Close()
certFile, err := os.Create(certPath)
if err != nil {
return err
}
defer certFile.Close()
err, priv, cert := CreateCertificate(cfg)
if err != nil {
return err
}
if err := pem.Encode(keyfile, &pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(priv)}); err != nil {
if err := pem.Encode(keyFile, &pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(priv)}); err != nil {
return err
}
return pem.Encode(certfile, &pem.Block{Type: "CERTIFICATE", Bytes: cert_raw})
return pem.Encode(certFile, &pem.Block{Type: "CERTIFICATE", Bytes: cert})
}