mirrors/dnscrypt-proxy
1
0
Fork 0
mirror of https://github.com/DNSCrypt/dnscrypt-proxy.git synced 2025-04-06 22:57:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Remove support for legacy CSV files

Browse source
This commit is contained in:
Frank Denis 2018-04-18 19:06:50 +02:00
parent 3d67c81697
commit f20da6b611
4 changed files with 6 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

55
dnscrypt-proxy/sources.go
View file

@ -1,7 +1,6 @@
package main
import (
"encoding/csv"
"errors"
"fmt"
"io"
@ -24,8 +23,7 @@ import (
type SourceFormat int
const (
SourceFormatV1 = iota
SourceFormatV2
SourceFormatV2 = iota
)
const (
@ -129,9 +127,7 @@ type URLToPrefetch struct {
func NewSource(xTransport *XTransport, urls []string, minisignKeyStr string, cacheFile string, formatStr string, refreshDelay time.Duration) (Source, []URLToPrefetch, error) {
_ = refreshDelay
source := Source{urls: urls}
if formatStr == "v1" {
source.format = SourceFormatV1
} else if formatStr == "v2" {
if formatStr == "v2" {
source.format = SourceFormatV2
} else {
return source, []URLToPrefetch{}, fmt.Errorf("Unsupported source format: [%s]", formatStr)
@ -210,58 +206,13 @@ func NewSource(xTransport *XTransport, urls []string, minisignKeyStr string, cac
}
func (source *Source) Parse(prefix string) ([]RegisteredServer, error) {
if source.format == SourceFormatV1 {
return source.parseV1(prefix)
} else if source.format == SourceFormatV2 {
if source.format == SourceFormatV2 {
return source.parseV2(prefix)
}
dlog.Fatal("Unexpected source format")
return []RegisteredServer{}, nil
}
func (source *Source) parseV1(prefix string) ([]RegisteredServer, error) {
var registeredServers []RegisteredServer
csvReader := csv.NewReader(strings.NewReader(source.in))
records, err := csvReader.ReadAll()
if err != nil {
return registeredServers, nil
}
for lineNo, record := range records {
if len(record) == 0 {
continue
}
if len(record) < 14 {
return registeredServers, fmt.Errorf("Parse error at line %d", 1+lineNo)
}
if lineNo == 0 {
continue
}
name := prefix + record[0]
description := record[2]
serverAddrStr := record[10]
providerName := record[11]
serverPkStr := record[12]
props := stamps.ServerInformalProperties(0)
if strings.EqualFold(record[7], "yes") {
props |= stamps.ServerInformalPropertyDNSSEC
}
if strings.EqualFold(record[8], "yes") {
props |= stamps.ServerInformalPropertyNoLog
}
stamp, err := stamps.NewDNSCryptServerStampFromLegacy(serverAddrStr, serverPkStr, providerName, props)
if err != nil {
return registeredServers, err
}
registeredServer := RegisteredServer{
name: name, stamp: stamp, description: description,
}
dlog.Debugf("Registered [%s] with stamp [%s]", name, stamp.String())
registeredServers = append(registeredServers, registeredServer)
}
return registeredServers, nil
}
func (source *Source) parseV2(prefix string) ([]RegisteredServer, error) {
var registeredServers []RegisteredServer
in := string(source.in)