Add client ip and cloudflare ray id

mipsel64 · mipsel64 · commit 8fad0890fd8c · 2021-11-14T17:37:52.000+07:00
diff --git a/constant.go b/constant.go
@@ -6,6 +6,8 @@ const (
 	ContentType              = "Content-Type"
 	OriginalURI              = "X-Original-URI"
 	RequestId                = "X-Request-ID"
+	ClientIp        				 = "CF-Connecting-IP"
+	RayId									   = "CF-RAY"
 	DefaultFormat            = "text/html"
 	DefaultErrorTemplateName = "error.html"
 )
diff --git a/hander.go b/hander.go
@@ -12,6 +12,8 @@ type Response struct {
 	ErrorCode   int    `json:"error_code"`
 	RequestId   string `json:"request_id"`
 	OriginalURI string `json:"original_uri"`
+	RayId       string `json:"ray_id"`   
+	ClientIp 		string `json:"client_ip"`
 	Message     string `json:"message"`
 }
 
@@ -54,6 +56,8 @@ func errorHandler(t *template.Template) func(http.ResponseWriter, *http.Request)
 			ErrorCode:   code,
 			RequestId:   r.Header.Get(RequestId),
 			OriginalURI: r.Header.Get(OriginalURI),
+			ClientIp:    r.Header.Get(ClientIp),
+			RayId:  		 r.Header.Get(RayId),
 			Message:     message,
 		}
 
diff --git a/www/error.html b/www/error.html
@@ -49,6 +49,9 @@
             font-weight: 300;
         }
 
+        span {
+            margin-right: 5px;
+        }
     </style>
 </head>
 <body>
@@ -61,12 +64,22 @@ <h2>
     </h2>
     {{- if .RequestId }}
     <h3>
-        Request ID: {{- .RequestId }}
+        <span>Request ID:</span>{{- .RequestId }}
     </h3>
     {{- end }}
     {{- if .OriginalURI }}
     <h3>
-        Original URI: {{- .OriginalURI }}
+        <span>Original URI:</span>{{- .OriginalURI }}
+    </h3>
+    {{- end }}
+    {{- if .RayId }}
+    <h3>
+        <span>Cloudflare Ray ID:</span>{{- .RayId }}
+    </h3>
+    {{- end }}
+    {{- if .ClientIp }}
+    <h3>
+        <span><b>Your IP:</b></span>{{- .ClientIp }}
     </h3>
     {{- end }}
 </div>

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@ const (`
`6`	`6`	`ContentType = "Content-Type"`
`7`	`7`	`OriginalURI = "X-Original-URI"`
`8`	`8`	`RequestId = "X-Request-ID"`
	`9`	`+ ClientIp = "CF-Connecting-IP"`
	`10`	`+ RayId = "CF-RAY"`
`9`	`11`	`DefaultFormat = "text/html"`
`10`	`12`	`DefaultErrorTemplateName = "error.html"`
`11`	`13`	`)`