github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-08-22 06:23:18 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

session: SessionModule.StringParam() swap error returns

Browse source 
tls: fix calling functions

modules: fix calling functions

session: fix calling functions
This commit is contained in:
Lars Lehtonen 2019-11-25 04:18:31 -08:00
commit 962903ecd6
No known key found for this signature in database
GPG key ID: 8137D474EBCB04F2
28 changed files with 85 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/any_proxy/any_proxy.go
View file

@ -81,17 +81,17 @@ func (mod *AnyProxy) Configure() error {
if mod.Running() {
return session.ErrAlreadyStarted(mod.Name())
} else if err, iface = mod.StringParam("any.proxy.iface"); err != nil {
} else if iface, err = mod.StringParam("any.proxy.iface"); err != nil {
return err
} else if err, protocol = mod.StringParam("any.proxy.protocol"); err != nil {
} else if protocol, err = mod.StringParam("any.proxy.protocol"); err != nil {
return err
} else if srcPort, err = mod.IntParam("any.proxy.src_port"); err != nil {
return err
} else if dstPort, err = mod.IntParam("any.proxy.dst_port"); err != nil {
return err
} else if err, srcAddress = mod.StringParam("any.proxy.src_address"); err != nil {
} else if srcAddress, err = mod.StringParam("any.proxy.src_address"); err != nil {
return err
} else if err, dstAddress = mod.StringParam("any.proxy.dst_address"); err != nil {
} else if dstAddress, err = mod.StringParam("any.proxy.dst_address"); err != nil {
return err
}

12
modules/api_rest/api_rest.go
View file

@ -189,23 +189,23 @@ func (mod *RestAPI) Configure() error {
if mod.Running() {
return session.ErrAlreadyStarted(mod.Name())
} else if err, ip = mod.StringParam("api.rest.address"); err != nil {
} else if ip, err = mod.StringParam("api.rest.address"); err != nil {
return err
} else if port, err = mod.IntParam("api.rest.port"); err != nil {
return err
} else if err, mod.allowOrigin = mod.StringParam("api.rest.alloworigin"); err != nil {
} else if mod.allowOrigin, err = mod.StringParam("api.rest.alloworigin"); err != nil {
return err
} else if err, mod.certFile = mod.StringParam("api.rest.certificate"); err != nil {
} else if mod.certFile, err = mod.StringParam("api.rest.certificate"); err != nil {
return err
} else if mod.certFile, err = fs.Expand(mod.certFile); err != nil {
return err
} else if err, mod.keyFile = mod.StringParam("api.rest.key"); err != nil {
} else if mod.keyFile, err = mod.StringParam("api.rest.key"); err != nil {
return err
} else if mod.keyFile, err = fs.Expand(mod.keyFile); err != nil {
return err
} else if err, mod.username = mod.StringParam("api.rest.username"); err != nil {
} else if mod.username, err = mod.StringParam("api.rest.username"); err != nil {
return err
} else if err, mod.password = mod.StringParam("api.rest.password"); err != nil {
} else if mod.password, err = mod.StringParam("api.rest.password"); err != nil {
return err
} else if mod.useWebsocket, err = mod.BoolParam("api.rest.websocket"); err != nil {
return err

4
modules/arp_spoof/arp_spoof.go
View file

@ -101,9 +101,9 @@ func (mod *ArpSpoofer) Configure() error {
return err
} else if mod.internal, err = mod.BoolParam("arp.spoof.internal"); err != nil {
return err
} else if err, targets = mod.StringParam("arp.spoof.targets"); err != nil {
} else if targets, err = mod.StringParam("arp.spoof.targets"); err != nil {
return err
} else if err, whitelist = mod.StringParam("arp.spoof.whitelist"); err != nil {
} else if whitelist, err = mod.StringParam("arp.spoof.whitelist"); err != nil {
return err
} else if mod.addresses, mod.macs, err = network.ParseTargets(targets, mod.Session.Lan.Aliases()); err != nil {
return err

2
modules/dns_spoof/dns_spoof.go
View file

@ -100,7 +100,7 @@ func (mod *DNSSpoofer) Configure() error {
return err
} else if err, domains = mod.ListParam("dns.spoof.domains"); err != nil {
return err
} else if err, hostsFile = mod.StringParam("dns.spoof.hosts"); err != nil {
} else if hostsFile, err = mod.StringParam("dns.spoof.hosts"); err != nil {
return err
}

8
modules/events_stream/events_stream.go
View file

@ -237,7 +237,7 @@ func (mod EventsStream) Author() string {
func (mod *EventsStream) Configure() (err error) {
var output string
if err, output = mod.StringParam("events.stream.output"); err == nil {
if output, err = mod.StringParam("events.stream.output"); err == nil {
if output == "" {
mod.output = os.Stdout
} else if mod.outputName, err = fs.Expand(output); err == nil {
@ -250,13 +250,13 @@ func (mod *EventsStream) Configure() (err error) {
if mod.rotation.Enabled, err = mod.BoolParam("events.stream.output.rotate"); err != nil {
return err
} else if err, mod.timeFormat = mod.StringParam("events.stream.time.format"); err != nil {
} else if mod.timeFormat, err = mod.StringParam("events.stream.time.format"); err != nil {
return err
} else if mod.rotation.Compress, err = mod.BoolParam("events.stream.output.rotate.compress"); err != nil {
return err
} else if err, mod.rotation.Format = mod.StringParam("events.stream.output.rotate.format"); err != nil {
} else if mod.rotation.Format, err = mod.StringParam("events.stream.output.rotate.format"); err != nil {
return err
} else if err, mod.rotation.How = mod.StringParam("events.stream.output.rotate.how"); err != nil {
} else if mod.rotation.How, err = mod.StringParam("events.stream.output.rotate.how"); err != nil {
return err
} else if mod.rotation.Period, err = mod.DecParam("events.stream.output.rotate.when"); err != nil {
return err

2
modules/events_stream/events_view.go
View file

@ -153,7 +153,7 @@ func (mod *EventsStream) doRotation() {
func (mod *EventsStream) View(e session.Event, refresh bool) {
var err error
if err, mod.timeFormat = mod.StringParam("events.stream.time.format"); err != nil {
if mod.timeFormat, err = mod.StringParam("events.stream.time.format"); err != nil {
fmt.Fprintf(mod.output, "%v", err)
mod.timeFormat = "15:04:05"
}

2
modules/gps/gps.go
View file

@ -73,7 +73,7 @@ func (mod *GPS) Author() string {
func (mod *GPS) Configure() (err error) {
if mod.Running() {
return session.ErrAlreadyStarted(mod.Name())
} else if err, mod.serialPort = mod.StringParam("gps.device"); err != nil {
} else if mod.serialPort, err = mod.StringParam("gps.device"); err != nil {
return err
} else if mod.baudRate, err = mod.IntParam("gps.baudrate"); err != nil {
return err

2
modules/hid/hid_inject.go
View file

@ -45,7 +45,7 @@ func errNoKeyMap(layout string) error {
func (mod *HIDRecon) prepInjection() (error, *network.HIDDevice, []*Command) {
var err error
if err, mod.sniffType = mod.StringParam("hid.force.type"); err != nil {
if mod.sniffType, err = mod.StringParam("hid.force.type"); err != nil {
return err, nil, nil
}

10
modules/http_proxy/http_proxy.go
View file

@ -90,21 +90,21 @@ func (mod *HttpProxy) Configure() error {
if mod.Running() {
return session.ErrAlreadyStarted(mod.Name())
} else if err, address = mod.StringParam("http.proxy.address"); err != nil {
} else if address, err = mod.StringParam("http.proxy.address"); err != nil {
return err
} else if proxyPort, err = mod.IntParam("http.proxy.port"); err != nil {
return err
} else if httpPort, err = mod.IntParam("http.port"); err != nil {
return err
} else if err, scriptPath = mod.StringParam("http.proxy.script"); err != nil {
} else if scriptPath, err = mod.StringParam("http.proxy.script"); err != nil {
return err
} else if stripSSL, err = mod.BoolParam("http.proxy.sslstrip"); err != nil {
return err
} else if err, jsToInject = mod.StringParam("http.proxy.injectjs"); err != nil {
} else if jsToInject, err = mod.StringParam("http.proxy.injectjs"); err != nil {
return err
} else if err, blacklist = mod.StringParam("http.proxy.blacklist"); err != nil {
} else if blacklist, err = mod.StringParam("http.proxy.blacklist"); err != nil {
return err
} else if err, whitelist = mod.StringParam("http.proxy.whitelist"); err != nil {
} else if whitelist, err = mod.StringParam("http.proxy.whitelist"); err != nil {
return err
}

4
modules/http_server/http_server.go
View file

@ -74,7 +74,7 @@ func (mod *HttpServer) Configure() error {
return session.ErrAlreadyStarted(mod.Name())
}
if err, path = mod.StringParam("http.server.path"); err != nil {
if path, err = mod.StringParam("http.server.path"); err != nil {
return err
}
@ -88,7 +88,7 @@ func (mod *HttpServer) Configure() error {
mod.server.Handler = router
if err, address = mod.StringParam("http.server.address"); err != nil {
if address, err = mod.StringParam("http.server.address"); err != nil {
return err
}

14
modules/https_proxy/https_proxy.go
View file

@ -107,7 +107,7 @@ func (mod *HttpsProxy) Configure() error {
if mod.Running() {
return session.ErrAlreadyStarted(mod.Name())
} else if err, address = mod.StringParam("https.proxy.address"); err != nil {
} else if address, err = mod.StringParam("https.proxy.address"); err != nil {
return err
} else if proxyPort, err = mod.IntParam("https.proxy.port"); err != nil {
return err
@ -115,21 +115,21 @@ func (mod *HttpsProxy) Configure() error {
return err
} else if stripSSL, err = mod.BoolParam("https.proxy.sslstrip"); err != nil {
return err
} else if err, certFile = mod.StringParam("https.proxy.certificate"); err != nil {
} else if certFile, err = mod.StringParam("https.proxy.certificate"); err != nil {
return err
} else if certFile, err = fs.Expand(certFile); err != nil {
return err
} else if err, keyFile = mod.StringParam("https.proxy.key"); err != nil {
} else if keyFile, err = mod.StringParam("https.proxy.key"); err != nil {
return err
} else if keyFile, err = fs.Expand(keyFile); err != nil {
return err
} else if err, scriptPath = mod.StringParam("https.proxy.script"); err != nil {
} else if scriptPath, err = mod.StringParam("https.proxy.script"); err != nil {
return err
} else if err, jsToInject = mod.StringParam("https.proxy.injectjs"); err != nil {
} else if jsToInject, err = mod.StringParam("https.proxy.injectjs"); err != nil {
return err
} else if err, blacklist = mod.StringParam("https.proxy.blacklist"); err != nil {
} else if blacklist, err = mod.StringParam("https.proxy.blacklist"); err != nil {
return err
} else if err, whitelist = mod.StringParam("https.proxy.whitelist"); err != nil {
} else if whitelist, err = mod.StringParam("https.proxy.whitelist"); err != nil {
return err
}

8
modules/https_server/https_server.go
View file

@ -92,7 +92,7 @@ func (mod *HttpsServer) Configure() error {
return session.ErrAlreadyStarted(mod.Name())
}
if err, path = mod.StringParam("https.server.path"); err != nil {
if path, err = mod.StringParam("https.server.path"); err != nil {
return err
}
@ -106,7 +106,7 @@ func (mod *HttpsServer) Configure() error {
mod.server.Handler = router
if err, address = mod.StringParam("https.server.address"); err != nil {
if address, err = mod.StringParam("https.server.address"); err != nil {
return err
}
@ -116,13 +116,13 @@ func (mod *HttpsServer) Configure() error {
mod.server.Addr = fmt.Sprintf("%s:%d", address, port)
if err, certFile = mod.StringParam("https.server.certificate"); err != nil {
if certFile, err = mod.StringParam("https.server.certificate"); err != nil {
return err
} else if certFile, err = fs.Expand(certFile); err != nil {
return err
}
if err, keyFile = mod.StringParam("https.server.key"); err != nil {
if keyFile, err = mod.StringParam("https.server.key"); err != nil {
return err
} else if keyFile, err = fs.Expand(keyFile); err != nil {
return err

4
modules/mac_changer/mac_changer.go
View file

@ -65,9 +65,9 @@ func (mod *MacChanger) Author() string {
func (mod *MacChanger) Configure() (err error) {
var changeTo string
if err, mod.iface = mod.StringParam("mac.changer.iface"); err != nil {
if mod.iface, err = mod.StringParam("mac.changer.iface"); err != nil {
return err
} else if err, changeTo = mod.StringParam("mac.changer.address"); err != nil {
} else if changeTo, err = mod.StringParam("mac.changer.address"); err != nil {
return err
}

12
modules/mdns_server/mdns_server.go
View file

@ -104,19 +104,19 @@ func (mod *MDNSServer) Configure() (err error) {
var port int
var info string
if err, host = mod.StringParam("mdns.server.host"); err != nil {
if host, err = mod.StringParam("mdns.server.host"); err != nil {
return err
} else if err, service = mod.StringParam("mdns.server.service"); err != nil {
} else if service, err = mod.StringParam("mdns.server.service"); err != nil {
return err
} else if err, domain = mod.StringParam("mdns.server.domain"); err != nil {
} else if domain, err = mod.StringParam("mdns.server.domain"); err != nil {
return err
} else if err, ip4 = mod.StringParam("mdns.server.address"); err != nil {
} else if ip4, err = mod.StringParam("mdns.server.address"); err != nil {
return err
} else if err, ip6 = mod.StringParam("mdns.server.address6"); err != nil {
} else if ip6, err = mod.StringParam("mdns.server.address6"); err != nil {
return err
} else if port, err = mod.IntParam("mdns.server.port"); err != nil {
return err
} else if err, info = mod.StringParam("mdns.server.info"); err != nil {
} else if info, err = mod.StringParam("mdns.server.info"); err != nil {
return err
}

6
modules/mysql_server/mysql_server.go
View file

@ -80,11 +80,11 @@ func (mod *MySQLServer) Configure() error {
if mod.Running() {
return session.ErrAlreadyStarted(mod.Name())
} else if err, mod.infile = mod.StringParam("mysql.server.infile"); err != nil {
} else if mod.infile, err = mod.StringParam("mysql.server.infile"); err != nil {
return err
} else if err, mod.outfile = mod.StringParam("mysql.server.outfile"); err != nil {
} else if mod.outfile, err = mod.StringParam("mysql.server.outfile"); err != nil {
return err
} else if err, address = mod.StringParam("mysql.server.address"); err != nil {
} else if address, err = mod.StringParam("mysql.server.address"); err != nil {
return err
} else if port, err = mod.IntParam("mysql.server.port"); err != nil {
return err

8
modules/net_sniff/net_sniff_context.go
View file

@ -32,7 +32,7 @@ func (mod *Sniffer) GetContext() (error, *SnifferContext) {
ctx := NewSnifferContext()
if err, ctx.Source = mod.StringParam("net.sniff.source"); err != nil {
if ctx.Source, err = mod.StringParam("net.sniff.source"); err != nil {
return err, ctx
}
@ -59,7 +59,7 @@ func (mod *Sniffer) GetContext() (error, *SnifferContext) {
return err, ctx
}
if err, ctx.Filter = mod.StringParam("net.sniff.filter"); err != nil {
if ctx.Filter, err = mod.StringParam("net.sniff.filter"); err != nil {
return err, ctx
} else if ctx.Filter != "" {
err = ctx.Handle.SetBPFFilter(ctx.Filter)
@ -68,7 +68,7 @@ func (mod *Sniffer) GetContext() (error, *SnifferContext) {
}
}
if err, ctx.Expression = mod.StringParam("net.sniff.regexp"); err != nil {
if ctx.Expression, err = mod.StringParam("net.sniff.regexp"); err != nil {
return err, ctx
} else if ctx.Expression != "" {
if ctx.Compiled, err = regexp.Compile(ctx.Expression); err != nil {
@ -76,7 +76,7 @@ func (mod *Sniffer) GetContext() (error, *SnifferContext) {
}
}
if err, ctx.Output = mod.StringParam("net.sniff.output"); err != nil {
if ctx.Output, err = mod.StringParam("net.sniff.output"); err != nil {
return err, ctx
} else if ctx.Output != "" {
if ctx.OutputFile, err = os.Create(ctx.Output); err != nil {

2
modules/net_sniff/net_sniff_fuzz.go
View file

@ -71,7 +71,7 @@ func (mod *Sniffer) doFuzzing(pkt gopacket.Packet) {
func (mod *Sniffer) configureFuzzing() (err error) {
layers := ""
if err, layers = mod.StringParam("net.fuzz.layers"); err != nil {
if layers, err = mod.StringParam("net.fuzz.layers"); err != nil {
return
} else {
mod.fuzzLayers = str.Comma(layers)

6
modules/packet_proxy/packet_proxy_linux_amd64.go
View file

@ -134,11 +134,11 @@ func (mod *PacketProxy) Configure() (err error) {
if mod.queueNum, err = mod.IntParam("packet.proxy.queue.num"); err != nil {
return
} else if err, mod.chainName = mod.StringParam("packet.proxy.chain"); err != nil {
} else if mod.chainName, err = mod.StringParam("packet.proxy.chain"); err != nil {
return
} else if err, mod.rule = mod.StringParam("packet.proxy.rule"); err != nil {
} else if mod.rule, err = mod.StringParam("packet.proxy.rule"); err != nil {
return
} else if err, mod.pluginPath = mod.StringParam("packet.proxy.plugin"); err != nil {
} else if mod.pluginPath, err = mod.StringParam("packet.proxy.plugin"); err != nil {
return
}

8
modules/tcp_proxy/tcp_proxy.go
View file

@ -98,19 +98,19 @@ func (mod *TcpProxy) Configure() error {
if mod.Running() {
return session.ErrAlreadyStarted(mod.Name())
} else if err, address = mod.StringParam("tcp.address"); err != nil {
} else if address, err = mod.StringParam("tcp.address"); err != nil {
return err
} else if err, proxyAddress = mod.StringParam("tcp.proxy.address"); err != nil {
} else if proxyAddress, err = mod.StringParam("tcp.proxy.address"); err != nil {
return err
} else if proxyPort, err = mod.IntParam("tcp.proxy.port"); err != nil {
return err
} else if port, err = mod.IntParam("tcp.port"); err != nil {
return err
} else if err, tunnelAddress = mod.StringParam("tcp.tunnel.address"); err != nil {
} else if tunnelAddress, err = mod.StringParam("tcp.tunnel.address"); err != nil {
return err
} else if tunnelPort, err = mod.IntParam("tcp.tunnel.port"); err != nil {
return err
} else if err, scriptPath = mod.StringParam("tcp.proxy.script"); err != nil {
} else if scriptPath, err = mod.StringParam("tcp.proxy.script"); err != nil {
return err
} else if mod.localAddr, err = net.ResolveTCPAddr("tcp", fmt.Sprintf("%s:%d", proxyAddress, proxyPort)); err != nil {
return err

2
modules/ticker/ticker.go
View file

@ -60,7 +60,7 @@ func (mod *Ticker) Configure() error {
if mod.Running() {
return session.ErrAlreadyStarted(mod.Name())
} else if err, commands = mod.StringParam("ticker.commands"); err != nil {
} else if commands, err = mod.StringParam("ticker.commands"); err != nil {
return err
} else if period, err = mod.IntParam("ticker.period"); err != nil {
return err

4
modules/ui/ui.go
View file

@ -73,13 +73,13 @@ func (mod *UIModule) Author() string {
}
func (mod *UIModule) Configure() (err error) {
if err, mod.basePath = mod.StringParam("ui.basepath"); err != nil {
if mod.basePath, err = mod.StringParam("ui.basepath"); err != nil {
return err
} else {
mod.uiPath = filepath.Join(mod.basePath, "ui")
}
if err, mod.tmpFile = mod.StringParam("ui.tmpfile"); err != nil {
if mod.tmpFile, err = mod.StringParam("ui.tmpfile"); err != nil {
return err
}

4
modules/utils/view_selector.go
View file

@ -57,7 +57,7 @@ func ViewSelectorFor(m *session.SessionModule, prefix string, sortFields []strin
}
func (s *ViewSelector) parseFilter() (err error) {
if err, s.Filter = s.owner.StringParam(s.filterName); err != nil {
if s.Filter, err = s.owner.StringParam(s.filterName); err != nil {
return
}
@ -76,7 +76,7 @@ func (s *ViewSelector) parseFilter() (err error) {
func (s *ViewSelector) parseSorting() (err error) {
expr := ""
if err, expr = s.owner.StringParam(s.sortName); err != nil {
if expr, err = s.owner.StringParam(s.sortName); err != nil {
return
}

8
modules/wifi/wifi.go
View file

@ -427,11 +427,11 @@ func (mod *WiFiModule) Configure() error {
return err
}
if err, mod.region = mod.StringParam("wifi.region"); err != nil {
if mod.region, err = mod.StringParam("wifi.region"); err != nil {
return err
} else if mod.txPower, err = mod.IntParam("wifi.txpower"); err != nil {
return err
} else if err, mod.source = mod.StringParam("wifi.source.file"); err != nil {
} else if mod.source, err = mod.StringParam("wifi.source.file"); err != nil {
return err
} else if mod.minRSSI, err = mod.IntParam("wifi.rssi.min"); err != nil {
return err
@ -439,7 +439,7 @@ func (mod *WiFiModule) Configure() error {
if mod.shakesAggregate, err = mod.BoolParam("wifi.handshakes.aggregate"); err != nil {
return err
} else if err, mod.shakesFile = mod.StringParam("wifi.handshakes.file"); err != nil {
} else if mod.shakesFile, err = mod.StringParam("wifi.handshakes.file"); err != nil {
return err
} else if mod.shakesFile != "" {
if mod.shakesFile, err = fs.Expand(mod.shakesFile); err != nil {
@ -447,7 +447,7 @@ func (mod *WiFiModule) Configure() error {
}
}
if err, ifName = mod.StringParam("wifi.interface"); err != nil {
if ifName, err = mod.StringParam("wifi.interface"); err != nil {
return err
} else if ifName == "" {
mod.iface = mod.Session.Interface

4
modules/wifi/wifi_ap.go
View file

@ -16,9 +16,9 @@ var errNoRecon = errors.New("Module wifi.ap requires module wifi.recon to be act
func (mod *WiFiModule) parseApConfig() (err error) {
var bssid string
if err, mod.apConfig.SSID = mod.StringParam("wifi.ap.ssid"); err != nil {
if mod.apConfig.SSID, err = mod.StringParam("wifi.ap.ssid"); err != nil {
return
} else if err, bssid = mod.StringParam("wifi.ap.bssid"); err != nil {
} else if bssid, err = mod.StringParam("wifi.ap.bssid"); err != nil {
return
} else if mod.apConfig.BSSID, err = net.ParseMAC(network.NormalizeMac(bssid)); err != nil {
return

2
modules/wifi/wifi_assoc.go
View file

@ -53,7 +53,7 @@ func (mod *WiFiModule) doAssocOpen() bool {
func (mod *WiFiModule) startAssoc(to net.HardwareAddr) error {
// parse skip list
if err, assocSkip := mod.StringParam("wifi.assoc.skip"); err != nil {
if assocSkip, err := mod.StringParam("wifi.assoc.skip"); err != nil {
return err
} else if macs, err := network.ParseMACs(assocSkip); err != nil {
return err

2
modules/wifi/wifi_deauth.go
View file

@ -69,7 +69,7 @@ func (mod *WiFiModule) doDeauthOpen() bool {
func (mod *WiFiModule) startDeauth(to net.HardwareAddr) error {
// parse skip list
if err, deauthSkip := mod.StringParam("wifi.deauth.skip"); err != nil {
if deauthSkip, err := mod.StringParam("wifi.deauth.skip"); err != nil {
return err
} else if macs, err := network.ParseMACs(deauthSkip); err != nil {
return err

12
session/module.go
View file

@ -155,7 +155,7 @@ func (m *SessionModule) Param(name string) *ModuleParam {
func (m SessionModule) ListParam(name string) (err error, values []string) {
values = make([]string, 0)
list := ""
if err, list = m.StringParam(name); err != nil {
if list, err = m.StringParam(name); err != nil {
return
} else {
parts := strings.Split(list, ",")
@ -169,20 +169,20 @@ func (m SessionModule) ListParam(name string) (err error, values []string) {
return
}
func (m SessionModule) StringParam(name string) (error, string) {
func (m SessionModule) StringParam(name string) (string, error) {
if p, found := m.params[name]; found {
if v, err := p.Get(m.Session); err != nil {
return err, ""
return "", err
} else {
return nil, v.(string)
return v.(string), nil
}
} else {
return fmt.Errorf("Parameter %s does not exist.", name), ""
return "", fmt.Errorf("Parameter %s does not exist.", name)
}
}
func (m SessionModule) IPParam(name string) (net.IP, error) {
if err, v := m.StringParam(name); err != nil {
if v, err := m.StringParam(name); err != nil {
return nil, err
} else {
return net.ParseIP(v), err

10
tls/cert.go
View file

@ -60,15 +60,15 @@ func CertConfigToModule(prefix string, m *session.SessionModule, defaults CertCo
func CertConfigFromModule(prefix string, m session.SessionModule) (cfg CertConfig, err error) {
if cfg.Bits, err = m.IntParam(prefix + ".certificate.bits"); err != nil {
return cfg, err
} else if err, cfg.Country = m.StringParam(prefix + ".certificate.country"); err != nil {
} else if cfg.Country, err = m.StringParam(prefix + ".certificate.country"); err != nil {
return cfg, err
} else if err, cfg.Locality = m.StringParam(prefix + ".certificate.locality"); err != nil {
} else if cfg.Locality, err = m.StringParam(prefix + ".certificate.locality"); err != nil {
return cfg, err
} else if err, cfg.Organization = m.StringParam(prefix + ".certificate.organization"); err != nil {
} else if cfg.Organization, err = m.StringParam(prefix + ".certificate.organization"); err != nil {
return cfg, err
} else if err, cfg.OrganizationalUnit = m.StringParam(prefix + ".certificate.organizationalunit"); err != nil {
} else if cfg.OrganizationalUnit, err = m.StringParam(prefix + ".certificate.organizationalunit"); err != nil {
return cfg, err
} else if err, cfg.CommonName = m.StringParam(prefix + ".certificate.commonname"); err != nil {
} else if cfg.CommonName, err = m.StringParam(prefix + ".certificate.commonname"); err != nil {
return cfg, err
}
return cfg, err