neale
/
spongy-client-chrome
mirror of https://github.com/nealey/spongy-client-chrome
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

s/server/network/

This commit is contained in:
Neale Pickett 2014-10-25 05:24:49 +00:00
parent befb373ae8
commit 332df850cd
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/wirc.cgi/wirc.cgi.go
View File

@ -19,7 +19,7 @@ type Handler struct {
cgi.Handler cgi.Handler
} }
var ServerDir string var NetworkDir string
func ReadString(fn string) string { func ReadString(fn string) string {
octets, err := ioutil.ReadFile(fn) octets, err := ioutil.ReadFile(fn)
@ -32,7 +32,7 @@ func ReadString(fn string) string {
func tail(w http.ResponseWriter, filename string, pos int64) { func tail(w http.ResponseWriter, filename string, pos int64) {
var err error var err error
currentfn := path.Join(ServerDir, "current") currentfn := path.Join(NetworkDir, "current")
if filename == "" { if filename == "" {
filename, err = os.Readlink(currentfn) filename, err = os.Readlink(currentfn)
if err != nil { if err != nil {
@ -40,7 +40,7 @@ func tail(w http.ResponseWriter, filename string, pos int64) {
} }
} }
filepath := path.Join(ServerDir, filename) filepath := path.Join(NetworkDir, filename)
f, err := os.Open(filepath) f, err := os.Open(filepath)
if err != nil { if err != nil {
@ -76,7 +76,7 @@ func tail(w http.ResponseWriter, filename string, pos int64) {
if (len(parts) >= 4) && (parts[3] == "NEXTLOG") { if (len(parts) >= 4) && (parts[3] == "NEXTLOG") {
watcher.Remove(filepath) watcher.Remove(filepath)
filename = parts[4] filename = parts[4]
filepath = path.Join(ServerDir, filename) filepath = path.Join(NetworkDir, filename)
f.Close() f.Close()
f, err = os.Open(filename) f, err = os.Open(filename)
if err != nil { if err != nil {
@ -105,10 +105,10 @@ func tail(w http.ResponseWriter, filename string, pos int64) {
} }
func handleCommand(w http.ResponseWriter, text string, target string) { func handleCommand(w http.ResponseWriter, text string, target string) {
fn := path.Join(ServerDir, fmt.Sprintf("outq/cgi.%d", time.Now().Unix())) fn := path.Join(NetworkDir, fmt.Sprintf("outq/cgi.%d", time.Now().Unix()))
f, err := os.Create(fn) f, err := os.Create(fn)
if err != nil { if err != nil {
fmt.Fprintln(w, "NO") fmt.Fprintln(w, "NO: Cannot create outq file")
fmt.Fprintln(w, err) fmt.Fprintln(w, err)
return return
} }
@ -128,18 +128,18 @@ func handleCommand(w http.ResponseWriter, text string, target string) {
func (h Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) { func (h Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
BaseDir := "servers" BaseDir := "networks"
DefaultDir := path.Join(BaseDir, "default") DefaultDir := path.Join(BaseDir, "default")
ServerDir = path.Join(BaseDir, r.FormValue("server")) NetworkDir = path.Join(BaseDir, r.FormValue("network"))
if path.Dir(DefaultDir) != path.Dir(ServerDir) { if path.Dir(DefaultDir) != path.Dir(NetworkDir) {
ServerDir = DefaultDir NetworkDir = DefaultDir
} }
authtok := ReadString(path.Join(ServerDir, "authtok")) authtok := ReadString(path.Join(NetworkDir, "authtok"))
if r.FormValue("auth") != authtok { if r.FormValue("auth") != authtok {
w.Header().Set("Content-Type", "text/plain") w.Header().Set("Content-Type", "text/plain")
fmt.Fprintln(w, "NO") fmt.Fprintln(w, "NO: Invalid authtok")
return return
} }
switch r.FormValue("type") { switch r.FormValue("type") {