Performed some cleanup
Mostly go formatting but a little creative spacing and commentstesting
parent
77c020e434
commit
e1c576f2a1
|
|
@ -1,9 +1,9 @@
|
|||
package cfg
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"log"
|
||||
"os"
|
||||
"bufio"
|
||||
)
|
||||
|
||||
const CFG = `
|
||||
|
|
@ -24,33 +24,33 @@ const CFG = `
|
|||
#download=https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts`
|
||||
|
||||
type Config struct {
|
||||
CfgLoc string
|
||||
Sites []string
|
||||
CfgLoc string
|
||||
Sites []string
|
||||
Downloads []string
|
||||
Whitelist []string
|
||||
}
|
||||
|
||||
// Create initialized a config to be used the entire session
|
||||
func Create(cfgLoc string)(cfg Config){
|
||||
func Create(cfgLoc string) (cfg Config) {
|
||||
cfg.CfgLoc = cfgLoc
|
||||
return
|
||||
}
|
||||
|
||||
// cfgparse recieves the location of the config file and returns a list of sites to add and content to download
|
||||
func (cfg Config) Update() (error, Config){
|
||||
func (cfg Config) Update() (error, Config) {
|
||||
l := (cfg.CfgLoc + "rhosts.cfg")
|
||||
var err error=nil
|
||||
var err error = nil
|
||||
log.Print("Opening: ", l)
|
||||
if _,err = os.Stat(cfg.CfgLoc); os.IsNotExist(err) {
|
||||
if _, err = os.Stat(cfg.CfgLoc); os.IsNotExist(err) {
|
||||
log.Print(cfg.CfgLoc + " Does not exist, attempting to create it")
|
||||
err = os.MkdirAll(cfg.CfgLoc,0755)
|
||||
err = os.MkdirAll(cfg.CfgLoc, 0755)
|
||||
if err != nil {
|
||||
log.Fatal("Could not create " + cfg.CfgLoc)
|
||||
}
|
||||
}
|
||||
if _,err = os.Stat(l); os.IsNotExist(err) {
|
||||
if _, err = os.Stat(l); os.IsNotExist(err) {
|
||||
log.Print(l + " does not exist, attempting to create a placeholder")
|
||||
err = os.WriteFile(l,[]byte(CFG),0644)
|
||||
err = os.WriteFile(l, []byte(CFG), 0644)
|
||||
if err != nil {
|
||||
log.Fatal("Unable to create file: " + l)
|
||||
}
|
||||
|
|
@ -63,16 +63,16 @@ func (cfg Config) Update() (error, Config){
|
|||
}
|
||||
filebuf := bufio.NewScanner(file)
|
||||
filebuf.Split(bufio.ScanLines)
|
||||
for res := filebuf.Scan();res;res = filebuf.Scan() {
|
||||
for res := filebuf.Scan(); res; res = filebuf.Scan() {
|
||||
state, body := cfgparseline(filebuf.Text())
|
||||
switch state {
|
||||
case 3:
|
||||
cfg.Sites =append(cfg.Sites,body)
|
||||
cfg.Sites = append(cfg.Sites, body)
|
||||
case 4:
|
||||
cfg.Downloads = append(cfg.Downloads,body)
|
||||
cfg.Downloads = append(cfg.Downloads, body)
|
||||
case 5:
|
||||
cfg.Whitelist = append(cfg.Whitelist,body)
|
||||
}
|
||||
cfg.Whitelist = append(cfg.Whitelist, body)
|
||||
}
|
||||
}
|
||||
err = filebuf.Err()
|
||||
if err != nil {
|
||||
|
|
@ -83,7 +83,7 @@ func (cfg Config) Update() (error, Config){
|
|||
}
|
||||
|
||||
// cfgparseline reads a single line of the config and returns the type and content of the line
|
||||
func cfgparseline(buf string) (uint8, string){
|
||||
func cfgparseline(buf string) (uint8, string) {
|
||||
// State options
|
||||
// 0 - Init
|
||||
// 1 - Error
|
||||
|
|
@ -91,54 +91,54 @@ func cfgparseline(buf string) (uint8, string){
|
|||
// 3 - Site
|
||||
// 4 - Download
|
||||
// 5 - Whitelist
|
||||
var state uint8= 0
|
||||
body :=buf[:]
|
||||
for i:=0; i<len(buf);i++ {
|
||||
var state uint8 = 0
|
||||
body := buf[:]
|
||||
for i := 0; i < len(buf); i++ {
|
||||
//fmt.Printf("%c",buf[i])
|
||||
switch buf[i] {
|
||||
case ' ':
|
||||
case '#':
|
||||
state = 2
|
||||
case 'd':
|
||||
if (len(buf) < i+10) {
|
||||
if len(buf) < i+10 {
|
||||
state = 1
|
||||
break
|
||||
}
|
||||
if (buf[i:(i+9)] == "download=") {
|
||||
i +=9
|
||||
if buf[i:(i+9)] == "download=" {
|
||||
i += 9
|
||||
state = 4
|
||||
body = buf[i:]
|
||||
} else{
|
||||
} else {
|
||||
state = 1
|
||||
}
|
||||
case 's':
|
||||
if (len(buf) < i+6) {
|
||||
if len(buf) < i+6 {
|
||||
state = 1
|
||||
break
|
||||
}
|
||||
if (buf[i:(i+5)] == "site=") {
|
||||
i +=5
|
||||
if buf[i:(i+5)] == "site=" {
|
||||
i += 5
|
||||
state = 3
|
||||
body = buf[i:]
|
||||
} else{
|
||||
} else {
|
||||
state = 0
|
||||
}
|
||||
//compare buf[i:(i+3)] to "site"
|
||||
case 'w':
|
||||
if (len(buf) < i+10) {
|
||||
if len(buf) < i+10 {
|
||||
state = 1
|
||||
break
|
||||
}
|
||||
if (buf[i:(i+10)] == "whitelist=") {
|
||||
i +=10
|
||||
if buf[i:(i+10)] == "whitelist=" {
|
||||
i += 10
|
||||
state = 5
|
||||
body = buf[i:]
|
||||
} else{
|
||||
} else {
|
||||
state = 1
|
||||
}
|
||||
}
|
||||
if (state !=0){
|
||||
return state,body
|
||||
if state != 0 {
|
||||
return state, body
|
||||
}
|
||||
}
|
||||
return state, body
|
||||
|
|
|
|||
|
|
@ -1,57 +1,58 @@
|
|||
package hosts
|
||||
|
||||
import (
|
||||
"os"
|
||||
"io"
|
||||
"net/http"
|
||||
"log"
|
||||
"bufio"
|
||||
"io"
|
||||
"jbreich/rhosts/cfg"
|
||||
"log"
|
||||
"net/http"
|
||||
"os"
|
||||
)
|
||||
|
||||
// siteList holds the location of all the sites along with a list of their location
|
||||
type siteList struct {
|
||||
location string
|
||||
location string
|
||||
siteEntry []siteEntry
|
||||
}
|
||||
|
||||
// siteEntry holds a single entry and if it is a repeat
|
||||
type siteEntry struct {
|
||||
repeat bool
|
||||
site string
|
||||
site string
|
||||
}
|
||||
|
||||
func Update(config cfg.Config, tmpdir, hostsloc string)(err error){
|
||||
func Update(config cfg.Config, tmpdir, hostsloc string) (err error) {
|
||||
var siteBuff []siteList
|
||||
|
||||
err = error(nil)
|
||||
err = copystatichosts(tmpdir, hostsloc)
|
||||
if (err != nil){
|
||||
if err != nil {
|
||||
log.Print("Failed to copy static entries")
|
||||
return nil
|
||||
return
|
||||
}
|
||||
defer os.Remove(tmpdir + "rhosts")
|
||||
err, siteBuff = downloadcontent(config.Downloads, tmpdir, hostsloc)
|
||||
if (err != nil){
|
||||
if err != nil {
|
||||
log.Print("Failed to download entries")
|
||||
return nil
|
||||
return
|
||||
}
|
||||
err = writesites(config.Sites, tmpdir, &siteBuff)
|
||||
if (err != nil){
|
||||
if err != nil {
|
||||
log.Print("Failed to failed to copy rhosts static entries")
|
||||
return nil
|
||||
return
|
||||
}
|
||||
removeduplicates(&siteBuff, &config.Whitelist)
|
||||
err = write2tmp(tmpdir, &siteBuff)
|
||||
if (err != nil){
|
||||
if err != nil {
|
||||
log.Print("Failed to write sites to tmpfile")
|
||||
return nil
|
||||
return
|
||||
}
|
||||
err = writetmp2hosts(hostsloc, tmpdir)
|
||||
if (err != nil){
|
||||
if err != nil {
|
||||
log.Print("Failed to copy to hosts file")
|
||||
return nil
|
||||
return
|
||||
}
|
||||
|
||||
log.Print("Finished updating host")
|
||||
return
|
||||
}
|
||||
|
||||
|
|
@ -72,33 +73,34 @@ func copystatichosts(tmpdir, hostsloc string) error {
|
|||
}
|
||||
filebuf := bufio.NewScanner(filer)
|
||||
filebuf.Split(bufio.ScanLines)
|
||||
for res := filebuf.Scan();res;res = filebuf.Scan() {
|
||||
for res := filebuf.Scan(); res; res = filebuf.Scan() {
|
||||
buff := filebuf.Text()
|
||||
if (buff == "# rhosts begin"){
|
||||
if buff == "# rhosts begin" {
|
||||
break
|
||||
}
|
||||
_,err := file.WriteString(buff + "\n")
|
||||
if (err != nil) {
|
||||
_, err := file.WriteString(buff + "\n")
|
||||
if err != nil {
|
||||
log.Print(err)
|
||||
return err
|
||||
}
|
||||
}
|
||||
_,err = file.WriteString("# rhosts begin\n")
|
||||
_, err = file.WriteString("# rhosts begin\n")
|
||||
err = filebuf.Err()
|
||||
return err
|
||||
}
|
||||
|
||||
// downloadcontent attempts to download the provided url and create a siteList. If the file fails to download it attempts to find an old copy from the hosts file.
|
||||
func downloadcontent(downloads []string, tmpdir string, hostsloc string) (err error, list []siteList){
|
||||
func downloadcontent(downloads []string, tmpdir string, hostsloc string) (err error, list []siteList) {
|
||||
for _, d := range downloads {
|
||||
var site siteList
|
||||
site.location = d
|
||||
log.Print("Downloading: ",d)
|
||||
log.Print("Downloading: ", d)
|
||||
response, err := http.Get(d)
|
||||
if (err !=nil) {
|
||||
if err != nil {
|
||||
log.Print(err)
|
||||
log.Print("Looking for old record in hosts file")
|
||||
downloadoldlookup(hostsloc, d, &site)
|
||||
}else{
|
||||
} else {
|
||||
defer response.Body.Close()
|
||||
scanner := bufio.NewScanner(response.Body)
|
||||
for scanner.Scan() {
|
||||
|
|
@ -114,22 +116,22 @@ func downloadcontent(downloads []string, tmpdir string, hostsloc string) (err er
|
|||
}
|
||||
|
||||
// checkDownloadLine parses the download line into just the address that needs to be blocked
|
||||
func checkDownloadLine (line string) (address siteEntry){
|
||||
func checkDownloadLine(line string) (address siteEntry) {
|
||||
var token []string
|
||||
address.repeat = false
|
||||
address.site = ""
|
||||
buff := ""
|
||||
lineLength := len(line) -1
|
||||
for i, c := range(line){
|
||||
lineLength := len(line) - 1
|
||||
for i, c := range line {
|
||||
if c != ' ' && i < lineLength {
|
||||
buff += string(c)
|
||||
}else if len(buff) > 0 {
|
||||
if i == lineLength{
|
||||
} else if len(buff) > 0 {
|
||||
if i == lineLength {
|
||||
buff += string(c)
|
||||
}
|
||||
token = append(token,buff)
|
||||
token = append(token, buff)
|
||||
buff = ""
|
||||
}
|
||||
}
|
||||
}
|
||||
if len(token) == 0 {
|
||||
return
|
||||
|
|
@ -137,15 +139,15 @@ func checkDownloadLine (line string) (address siteEntry){
|
|||
if token[0][0] == '#' {
|
||||
return
|
||||
}
|
||||
for _, t := range(token) {
|
||||
for _, t := range token {
|
||||
var period uint
|
||||
var failed bool
|
||||
period = 0
|
||||
failed = false
|
||||
for _, c := range(t) {
|
||||
switch c{
|
||||
for _, c := range t {
|
||||
switch c {
|
||||
case '.':
|
||||
period ++
|
||||
period++
|
||||
case '#':
|
||||
return
|
||||
case ':':
|
||||
|
|
@ -153,7 +155,7 @@ func checkDownloadLine (line string) (address siteEntry){
|
|||
break
|
||||
}
|
||||
}
|
||||
if period <=2 && failed == false {
|
||||
if period <= 2 && failed == false {
|
||||
address.site = t
|
||||
return
|
||||
}
|
||||
|
|
@ -165,9 +167,9 @@ func checkDownloadLine (line string) (address siteEntry){
|
|||
func downloadoldlookup(hostsloc, d string, site *siteList) error {
|
||||
var err error = nil
|
||||
var state uint8 = 0
|
||||
|
||||
|
||||
hostsf, err := os.Open(hostsloc)
|
||||
if (err != nil){
|
||||
if err != nil {
|
||||
log.Print(err)
|
||||
return err
|
||||
}
|
||||
|
|
@ -175,18 +177,18 @@ func downloadoldlookup(hostsloc, d string, site *siteList) error {
|
|||
|
||||
fbuff := bufio.NewScanner(hostsf)
|
||||
fbuff.Split(bufio.ScanLines)
|
||||
for res := fbuff.Scan();res;res = fbuff.Scan() {
|
||||
for res := fbuff.Scan(); res; res = fbuff.Scan() {
|
||||
buff := fbuff.Text()
|
||||
switch state {
|
||||
case 0:
|
||||
if (buff == "# rhosts download - " + d){
|
||||
if buff == "# rhosts download - "+d {
|
||||
log.Print("Found old record in hosts file:" + buff)
|
||||
state =1
|
||||
state = 1
|
||||
}
|
||||
case 1:
|
||||
if (len(buff) >=9 && buff[0:8] == "# rhosts"){
|
||||
if len(buff) >= 9 && buff[0:8] == "# rhosts" {
|
||||
state = 2
|
||||
}else{
|
||||
} else {
|
||||
siteBuff := checkDownloadLine(buff)
|
||||
if siteBuff.site != "" {
|
||||
site.siteEntry = append(site.siteEntry, siteBuff)
|
||||
|
|
@ -195,7 +197,7 @@ func downloadoldlookup(hostsloc, d string, site *siteList) error {
|
|||
case 3:
|
||||
return nil
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
return err
|
||||
|
|
@ -211,17 +213,18 @@ func writesites(sites []string, tmpdir string, siteBuff *[]siteList) (err error)
|
|||
if len(sites) == 0 {
|
||||
return
|
||||
}
|
||||
for _,s := range sites {
|
||||
for _, s := range sites {
|
||||
var site siteEntry
|
||||
site.repeat = false
|
||||
site.site = s
|
||||
localList.siteEntry = append(localList.siteEntry,site)
|
||||
localList.siteEntry = append(localList.siteEntry, site)
|
||||
}
|
||||
*siteBuff = append(*siteBuff,localList)
|
||||
*siteBuff = append(*siteBuff, localList)
|
||||
return
|
||||
}
|
||||
|
||||
// removeduplicates removes any duplicate or uneeded/unwanted addresses
|
||||
func removeduplicates(siteBuff *[]siteList, whitelist *[]string){
|
||||
func removeduplicates(siteBuff *[]siteList, whitelist *[]string) {
|
||||
var safewords = []string{"localhost", "localhost.localdomain", "broadcasthost", "ip6-loopback", "ip6-localhost", "ip6-localnet", "ip6-mcastprefix", "ip6-allnodes", "ip6-allrouters", "ip6-allhosts", "local"}
|
||||
var c struct {
|
||||
d uint
|
||||
|
|
@ -232,37 +235,37 @@ func removeduplicates(siteBuff *[]siteList, whitelist *[]string){
|
|||
c.s = 0
|
||||
c.w = 0
|
||||
log.Print("Checking for duplicates")
|
||||
var entry []struct{
|
||||
var entry []struct {
|
||||
r *bool
|
||||
s *string
|
||||
}
|
||||
var entryBuff struct{
|
||||
var entryBuff struct {
|
||||
r *bool
|
||||
s *string
|
||||
}
|
||||
for i := len((*siteBuff))-1; i > -1; i --{
|
||||
for j := len((*siteBuff)[i].siteEntry)-1; j > -1; j -- {
|
||||
for i := len((*siteBuff)) - 1; i > -1; i-- {
|
||||
for j := len((*siteBuff)[i].siteEntry) - 1; j > -1; j-- {
|
||||
entryBuff.r = &((*siteBuff)[i].siteEntry[j].repeat)
|
||||
entryBuff.s = &((*siteBuff)[i].siteEntry[j].site)
|
||||
entry = append(entry,entryBuff)
|
||||
entry = append(entry, entryBuff)
|
||||
}
|
||||
}
|
||||
lenEntry := len(entry)
|
||||
for i,e := range(entry) {
|
||||
for _,w := range(safewords){
|
||||
for i, e := range entry {
|
||||
for _, w := range safewords {
|
||||
if *e.s == w {
|
||||
*(entry[i].r) = true
|
||||
c.s ++
|
||||
c.s++
|
||||
break
|
||||
}
|
||||
}
|
||||
if *(entry[i].r) == true {
|
||||
continue
|
||||
}
|
||||
for _,w := range(*whitelist){
|
||||
for _, w := range *whitelist {
|
||||
if *e.s == w {
|
||||
*(entry[i].r) = true
|
||||
c.w ++
|
||||
c.w++
|
||||
break
|
||||
}
|
||||
}
|
||||
|
|
@ -272,35 +275,36 @@ func removeduplicates(siteBuff *[]siteList, whitelist *[]string){
|
|||
if i == lenEntry {
|
||||
break
|
||||
}
|
||||
for j,n := range(entry[i+1:]){
|
||||
for j, n := range entry[i+1:] {
|
||||
if *e.s == *n.s {
|
||||
*(entry[i+j].r) = true
|
||||
c.d ++
|
||||
c.d++
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
log.Printf("Total: %d\tDuplicates: %d\tSafeWords: %d\tWhitelisted: %d\n", lenEntry, c.d, c.s, c.w)
|
||||
}
|
||||
|
||||
// write2tmp write the siteBuff to the tempfile
|
||||
func write2tmp(tmpdir string, siteBuff *[]siteList) (err error) {
|
||||
err = nil
|
||||
tmploc := tmpdir+ "rhosts"
|
||||
tmploc := tmpdir + "rhosts"
|
||||
tmpf, err := os.OpenFile(tmploc, os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0600)
|
||||
defer tmpf.Close()
|
||||
if err != nil {
|
||||
log.Print(err)
|
||||
return err
|
||||
}
|
||||
for _,location := range(*siteBuff){
|
||||
for _, location := range *siteBuff {
|
||||
if len(location.siteEntry) == 0 {
|
||||
continue
|
||||
}
|
||||
_,err := tmpf.WriteString("# rhosts download - " + location.location + "\n")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
for _,site := range(location.siteEntry){
|
||||
_, err := tmpf.WriteString("# rhosts download - " + location.location + "\n")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
for _, site := range location.siteEntry {
|
||||
if site.repeat == false {
|
||||
_, err = tmpf.WriteString("0.0.0.0 " + site.site + "\n")
|
||||
if err != nil {
|
||||
|
|
@ -315,26 +319,26 @@ func write2tmp(tmpdir string, siteBuff *[]siteList) (err error) {
|
|||
}
|
||||
return
|
||||
}
|
||||
|
||||
// writetmp2hosts overwrites the hostsfile with the tmp file
|
||||
func writetmp2hosts(hostsloc, tmpdir string) error {
|
||||
var err error = nil
|
||||
tmploc := tmpdir + "rhosts"
|
||||
|
||||
hosts, err := os.Create(hostsloc)
|
||||
if (err != nil){
|
||||
if err != nil {
|
||||
log.Print(err)
|
||||
return err
|
||||
}
|
||||
tmp, err := os.Open(tmploc)
|
||||
if (err != nil){
|
||||
if err != nil {
|
||||
log.Print(err)
|
||||
return err
|
||||
}
|
||||
_,err = io.Copy(hosts,tmp)
|
||||
if (err != nil){
|
||||
_, err = io.Copy(hosts, tmp)
|
||||
if err != nil {
|
||||
log.Print(err)
|
||||
}
|
||||
|
||||
|
||||
return err
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,25 +17,23 @@
|
|||
* along with rhosts. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
|
||||
// rhosts - Program used to maintain a blocklist appended to a host file
|
||||
// rhosts - Program used to maintain a blocklist appended to a host file
|
||||
package main
|
||||
|
||||
import (
|
||||
"log"
|
||||
"flag"
|
||||
"fmt"
|
||||
"time"
|
||||
sysos "jbreich/rhosts/sys"
|
||||
"jbreich/rhosts/serve"
|
||||
"jbreich/rhosts/cfg"
|
||||
"jbreich/rhosts/hosts"
|
||||
"jbreich/rhosts/serve"
|
||||
sysos "jbreich/rhosts/sys"
|
||||
"log"
|
||||
"time"
|
||||
)
|
||||
|
||||
var Exit chan bool
|
||||
|
||||
|
||||
const GPL =`
|
||||
const GPL = `
|
||||
rhosts maintains a blocklist and appends it to the system hosts file
|
||||
|
||||
Copyright (C) 2021 Justin Reichardt
|
||||
|
|
@ -54,15 +52,14 @@ const GPL =`
|
|||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
`
|
||||
|
||||
|
||||
func main() {
|
||||
tmpdir := ""
|
||||
hostsloc := ""
|
||||
cfgloc := ""
|
||||
var daemon bool=false
|
||||
var interval int=1440
|
||||
var versionflag bool=false
|
||||
var removetimestamp bool=false
|
||||
var daemon bool = false
|
||||
var interval int = 1440
|
||||
var versionflag bool = false
|
||||
var removetimestamp bool = false
|
||||
|
||||
// Parsing Flags
|
||||
flag.BoolVar(&daemon, "d", false, "Should this be run in daemon mode")
|
||||
|
|
@ -80,42 +77,54 @@ func main() {
|
|||
// Check if timestamp should be removed
|
||||
if removetimestamp {
|
||||
log.SetFlags(0)
|
||||
}else{
|
||||
} else {
|
||||
// GPL information
|
||||
fmt.Println(GPL)
|
||||
}
|
||||
|
||||
if daemon {
|
||||
log.Print("daemon:" , daemon)
|
||||
log.Print("interval:",interval)
|
||||
log.Print("daemon:", daemon)
|
||||
log.Print("interval:", interval)
|
||||
}
|
||||
|
||||
sysos.Detect (&tmpdir, &hostsloc, &cfgloc)
|
||||
sysos.Detect(&tmpdir, &hostsloc, &cfgloc)
|
||||
|
||||
// Read the config file
|
||||
config := cfg.Create(cfgloc)
|
||||
err,config := config.Update()
|
||||
log.Print(config)
|
||||
if (err != nil){log.Panic("Failed to parse config: " + cfgloc)}
|
||||
err, config := config.Update()
|
||||
if err != nil {
|
||||
log.Panic("Failed to parse config: " + cfgloc)
|
||||
}
|
||||
|
||||
// Starting web server
|
||||
serve.Start("blank")
|
||||
|
||||
|
||||
for true {
|
||||
// Update the hosts file
|
||||
if daemon == false {
|
||||
err := hosts.Update(config, tmpdir, hostsloc)
|
||||
if (err != nil){
|
||||
if err != nil {
|
||||
log.Print(err)
|
||||
}
|
||||
log.Print("Finished updating host")
|
||||
if (daemon == true){
|
||||
i := time.Now().Add(time.Duration(interval) * time.Minute).Format(time.Layout)
|
||||
log.Printf("Sleeping for %d minutes", interval)
|
||||
log.Print("Should restart at: " + i)
|
||||
time.Sleep(time.Duration(interval) * time.Minute)
|
||||
}else{
|
||||
break
|
||||
} else {
|
||||
|
||||
for true {
|
||||
err := hosts.Update(config, tmpdir, hostsloc)
|
||||
if err != nil {
|
||||
log.Print(err)
|
||||
}
|
||||
|
||||
// Check if daemon
|
||||
if daemon == false {
|
||||
break
|
||||
}
|
||||
|
||||
if err == nil {
|
||||
i := time.Now().Add(time.Duration(interval) * time.Minute).Format(time.Layout)
|
||||
log.Printf("Sleeping for %d minutes", interval)
|
||||
log.Print("Should restart at: " + i)
|
||||
time.Sleep(time.Duration(interval) * time.Minute)
|
||||
}
|
||||
}
|
||||
}
|
||||
serve.Start("blank")
|
||||
<- Exit
|
||||
<-Exit
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
// Provides the web server for rhosts to relay altered content
|
||||
package serve
|
||||
|
||||
import(
|
||||
import (
|
||||
"net/http"
|
||||
)
|
||||
|
||||
|
|
@ -11,15 +11,15 @@ func Start(certLoc string) {
|
|||
|
||||
}
|
||||
|
||||
func httpServer() (err error){
|
||||
err = http.ListenAndServe("127.0.0.1:80",http.HandlerFunc(httpHandler))
|
||||
func httpServer() (err error) {
|
||||
err = http.ListenAndServe("127.0.0.1:80", http.HandlerFunc(httpHandler))
|
||||
return
|
||||
}
|
||||
func httpsServer(certLoc *string) (err error){
|
||||
err = http.ListenAndServeTLS("127.0.0.1:80",*certLoc + "ca.crt", *certLoc + "ca.key",http.HandlerFunc(httpHandler))
|
||||
func httpsServer(certLoc *string) (err error) {
|
||||
err = http.ListenAndServeTLS("127.0.0.1:80", *certLoc+"ca.crt", *certLoc+"ca.key", http.HandlerFunc(httpHandler))
|
||||
return
|
||||
}
|
||||
|
||||
func httpHandler(w http.ResponseWriter, r *http.Request) {
|
||||
http.Error(w,"Test",200)
|
||||
http.Error(w, "Test", 200)
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue