dave/vpngate
1
0
Fork 0
mirror of https://github.com/davegallant/vpngate.git synced 2025-08-06 08:43:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Strip out quotes (#97)

Browse Source 
* Add Retry function

* Strip out quotations from csv
This commit is contained in:
Dave Gallant
2023-04-02 03:46:28 +00:00
committed by GitHub
parent d93b835130
commit 000d5762e8
3 changed files with 47 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
pkg/vpn/list.go
View File

@@ -8,6 +8,7 @@ import (
"github.com/jszwec/csvutil"
"github.com/rs/zerolog/log"
"github.com/davegallant/vpngate/pkg/util"
"github.com/juju/errors"
)
@@ -44,6 +45,7 @@ func parseVpnList(r io.Reader) (*[]Server, error) {
// Trim known invalid rows
serverList = bytes.TrimPrefix(serverList, []byte("*vpn_servers\r\n"))
serverList = bytes.TrimSuffix(serverList, []byte("*\r\n"))
serverList = bytes.ReplaceAll(serverList, []byte(`"`), []byte{})
if err := csvutil.Unmarshal(serverList, &servers); err != nil {
return nil, errors.Annotatef(err, "Unable to parse CSV")
@@ -73,27 +75,36 @@ func GetList() (*[]Server, error) {
log.Info().Msg("Fetching the latest server list")
r, err := http.Get(vpnList)
if err != nil {
return nil, errors.Annotate(err, "Unable to retrieve vpn list")
}
var r *http.Response
defer r.Body.Close()
err := util.Retry(5, 1, func() error {
var err error
r, err = http.Get(vpnList)
if err != nil {
return err
}
defer r.Body.Close()
if r.StatusCode != 200 {
return nil, errors.Annotatef(err, "Unexpected status code when retrieving vpn list: %d", r.StatusCode)
}
if r.StatusCode != 200 {
return errors.Annotatef(err, "Unexpected status code when retrieving vpn list: %d", r.StatusCode)
}
servers, err = parseVpnList(r.Body)
servers, err = parseVpnList(r.Body)
if err != nil {
return err
}
err = writeVpnListToCache(*servers)
if err != nil {
log.Warn().Msgf("Unable to write servers to cache: %s", err)
}
return nil
})
if err != nil {
return nil, errors.Annotate(err, "unable to parse vpn list")
}
err = writeVpnListToCache(*servers)
if err != nil {
log.Warn().Msgf("Unable to write servers to cache: %s", err)
return nil, err
}
return servers, nil