Home Explore Help
Sign In
joker
/
frp
mirror of https://github.com/fatedier/frp/
1
0
Fork 0
Files Issues 0 Wiki
Browse Source

vhost: return 404 not found page if domain doesn't exist

fatedier 7 years ago
parent
2a044c9d6d
commit
5b303f5148
2 changed files with 67 additions and 3 deletions
Unified View Show Diff Stats
  1. 62 0
      utils/vhost/resource.go
  2. 5 3
      utils/vhost/vhost.go

+ 62 - 0
utils/vhost/resource.go
View File 

@@ -0,0 +1,62 @@
 
+// Copyright 2017 fatedier, fatedier@gmail.com
 
+//
 
+// Licensed under the Apache License, Version 2.0 (the "License");
 
+// you may not use this file except in compliance with the License.
 
+// You may obtain a copy of the License at
 
+//
 
+//     http://www.apache.org/licenses/LICENSE-2.0
 
+//
 
+// Unless required by applicable law or agreed to in writing, software
 
+// distributed under the License is distributed on an "AS IS" BASIS,
 
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 
+// See the License for the specific language governing permissions and
 
+// limitations under the License.
 
+
 
+package vhost
 
+
 
+import (
 
+	"io/ioutil"
 
+	"net/http"
 
+	"strings"
 
+
 
+	"github.com/fatedier/frp/utils/version"
 
+)
 
+
 
+const (
 
+	NotFound = `<!DOCTYPE html>
 
+<html>
 
+<head>
 
+<title>Not Found</title>
 
+<style>
 
+    body {
 
+        width: 35em;
 
+        margin: 0 auto;
 
+        font-family: Tahoma, Verdana, Arial, sans-serif;
 
+    }
 
+</style>
 
+</head>
 
+<body>
 
+<h1>The page you visit not found.</h1>
 
+<p>Sorry, the page you are looking for is currently unavailable.<br/>
 
+Please try again later.</p>
 
+<p>The server is powered by <a href="https://github.com/fatedier/frp">frp</a>.</p>
 
+<p><em>Faithfully yours, frp.</em></p>
 
+</body>
 
+</html>
 
+`
 
+)
 
+
 
+func notFoundResponse() *http.Response {
 
+	header := make(http.Header)
 
+	header.Set("server", "frp/"+version.Full())
 
+	res := &http.Response{
 
+		Status:     "Not Found",
 
+		StatusCode: 400,
 
+		Proto:      "HTTP/1.0",
 
+		ProtoMajor: 1,
 
+		ProtoMinor: 0,
 
+		Header:     header,
 
+		Body:       ioutil.NopCloser(strings.NewReader(NotFound)),
 
+	}
 
+	return res
 
+}

+ 5 - 3
utils/vhost/vhost.go
View File 

@@ -126,7 +126,7 @@ func (v *VhostMuxer) handle(c frpNet.Conn) {
 
 
 
 	sConn, reqInfoMap, err := v.vhostFunc(c)
 
 	sConn, reqInfoMap, err := v.vhostFunc(c)
 
 	if err != nil {
 
 	if err != nil {
 
-		log.Error("get hostname from http/https request error: %v", err)
 
+		log.Warn("get hostname from http/https request error: %v", err)
 
 		c.Close()
 
 		c.Close()
 
 		return
 
 		return
 
 	}
 
 	}
 
@@ -135,17 +135,19 @@ func (v *VhostMuxer) handle(c frpNet.Conn) {
 
 	path := strings.ToLower(reqInfoMap["Path"])
 
 	path := strings.ToLower(reqInfoMap["Path"])
 
 	l, ok := v.getListener(name, path)
 
 	l, ok := v.getListener(name, path)
 
 	if !ok {
 
 	if !ok {
 
+		res := notFoundResponse()
 
+		res.Write(c)
 
 		log.Debug("http request for host [%s] path [%s] not found", name, path)
 
 		log.Debug("http request for host [%s] path [%s] not found", name, path)
 
 		c.Close()
 
 		c.Close()
 
 		return
 
 		return
 
 	}
 
 	}
 
 
 
 	// if authFunc is exist and userName/password is set
 
 	// if authFunc is exist and userName/password is set
 
-	// verify user access
 
+	// then verify user access
 
 	if l.mux.authFunc != nil && l.userName != "" && l.passWord != "" {
 
 	if l.mux.authFunc != nil && l.userName != "" && l.passWord != "" {
 
 		bAccess, err := l.mux.authFunc(c, l.userName, l.passWord, reqInfoMap["Authorization"])
 
 		bAccess, err := l.mux.authFunc(c, l.userName, l.passWord, reqInfoMap["Authorization"])
 
 		if bAccess == false || err != nil {
 
 		if bAccess == false || err != nil {
 
-			l.Debug("check Authorization failed")
 
+			l.Debug("check http Authorization failed")
 
 			res := noAuthResponse()
 
 			res := noAuthResponse()
 
 			res.Write(c)
 
 			res.Write(c)
 
 			c.Close()
 
 			c.Close()