Add NeedRedirect to site

casbin · Oct 6, 2023 · 2feab2b · 2feab2b
1 parent 53d5233
commit 2feab2b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/object/site.go b/object/site.go
@@ -42,6 +42,7 @@ type Site struct {
 	Tag          string   `xorm:"varchar(100)" json:"tag"`
 	Domain       string   `xorm:"varchar(100)" json:"domain"`
 	OtherDomains []string `xorm:"varchar(500)" json:"otherDomains"`
+	NeedRedirect bool     `json:"needRedirect"`
 	Host         string   `xorm:"varchar(100)" json:"host"`
 	Port         int      `json:"port"`
 	SslMode      string   `xorm:"varchar(100)" json:"sslMode"`

diff --git a/service/proxy.go b/service/proxy.go
@@ -69,7 +69,7 @@ func redirectToHttps(w http.ResponseWriter, r *http.Request) {
 	http.Redirect(w, r, targetUrl, http.StatusMovedPermanently)
 }
 
-func redirectToNonWww(w http.ResponseWriter, r *http.Request, host string) {
+func redirectToHost(w http.ResponseWriter, r *http.Request, host string) {
 	protocol := "https"
 	if r.TLS == nil {
 		protocol = "http"
@@ -90,9 +90,13 @@ func handleRequest(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	if site.Host != r.Host && site.NeedRedirect {
+		redirectToHost(w, r, site.Host)
+	}
+
 	hostNonWww := getHostNonWww(r.Host)
 	if hostNonWww != "" {
-		redirectToNonWww(w, r, hostNonWww)
+		redirectToHost(w, r, hostNonWww)
 	}
 
 	if site.Node == "" {

diff --git a/web/src/SiteEditPage.js b/web/src/SiteEditPage.js
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import React from "react";
-import {Button, Card, Col, Input, InputNumber, Row, Select} from "antd";
+import {Button, Card, Col, Input, InputNumber, Row, Select, Switch} from "antd";
 import {LinkOutlined} from "@ant-design/icons";
 import * as SiteBackend from "./backend/SiteBackend";
 import * as CertBackend from "./backend/CertBackend";
@@ -146,6 +146,16 @@ class SiteEditPage extends React.Component {
             </Select>
           </Col>
         </Row>
+        <Row style={{marginTop: "20px"}} >
+          <Col style={{marginTop: "5px"}} span={2}>
+            {i18next.t("site:Need redirect")}:
+          </Col>
+          <Col span={1} >
+            <Switch checked={this.state.site.needRedirect} onChange={checked => {
+              this.updateSiteField("needRedirect", checked);
+            }} />
+          </Col>
+        </Row>
         <Row style={{marginTop: "20px"}} >
           <Col style={{marginTop: "5px"}} span={2}>
             {i18next.t("site:Host")}:

diff --git a/web/src/SiteListPage.js b/web/src/SiteListPage.js
@@ -51,6 +51,7 @@ class SiteListPage extends React.Component {
       displayName: `New Site - ${randomName}`,
       domain: "door.casdoor.com",
       otherDomains: [],
+      needRedirect: false,
       host: "",
       port: 8000,
       sslMode: "HTTP",
@@ -176,7 +177,7 @@ class SiteListPage extends React.Component {
           return record.otherDomains.map(domain => {
             return (
               <a key={domain} target="_blank" rel="noreferrer" href={`https://${domain}`}>
-                <Tag color={"processing"}>
+                <Tag color={record.needRedirect ? "default" : "processing"}>
                   {domain}
                 </Tag>
               </a>