Merge pull request #84 from ictsc/feature/add_same_site_mode_toggle_c…

…onfig

update SameSiteMode を切り替えるコンフィグを追加

cmd/rikka/config.go

@@ -43,7 +43,8 @@ type CORSConfig struct {
 }
 
 type StoreConfig struct {
-	Secure bool `yaml:"secure"`
+	Secure             bool `yaml:"secure"`
+	SameSiteStrictMode bool `yaml:"sameSiteStrictMode"`
 }
 
 type RedisConfig struct {

cmd/rikka/config.yaml.example

@@ -11,6 +11,7 @@ cors:
 ## Cookie Secure Flag
 store:
   secure: false
+  sameSiteStrictMode: false
 notify:
   answer: https://hooks.slack.com/services/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
 mariadb:

cmd/rikka/main.go

@@ -86,12 +86,20 @@ func init() {
 		f.Close()
 		log.Fatalf(errors.Wrapf(err, "Failed to open redis connection.").Error())
 	}
+
+	var sameSiteMode http.SameSite
+	if config.Store.SameSiteStrictMode {
+		sameSiteMode = http.SameSiteStrictMode
+	} else {
+		sameSiteMode = http.SameSiteDefaultMode
+	}
+
 	store.Options(sessions.Options{
 		MaxAge:   43200,
 		Path:     "/",
 		Secure:   config.Store.Secure,
 		HttpOnly: true,
-		SameSite: http.SameSiteNoneMode,
+		SameSite: sameSiteMode,
 	})
 	minioClient, err = minio.New(config.Minio.Endpoint, &minio.Options{
 		Creds:  credentials.NewStaticV4(config.Minio.AccessKeyID, config.Minio.SecretAccessKey, ""),

scripts/README.md

@@ -0,0 +1,9 @@
+```sh
+python scripts/create_user.py {API-Server-IP}/api
+
+user_group_name: ictsc
+user_group_organization: ictsc
+user_group_invitation_token: ictsc_token
+user_name: ictsc
+user_password: ictsc
+```

scripts/create_rehearsal.py

@@ -8,10 +8,10 @@ def main():
     client.HTTPConnection.debuglevel = 1
     logging.basicConfig(level=logging.DEBUG)
 
-    rikka = Rikka(baseurl="https://ss.ictsc.net/api")
+    rikka = Rikka(baseurl="http://localhost:8080/api")
 
     print(f"\x1b[33m\n*** signin\x1b[0m")
-    rikka.signin("ictsc", "2ht4BN9q6tjc")
+    rikka.signin("admin", "password")
 
     print(f"\x1b[33m\n*** Create user group\x1b[0m")
     resp = rikka.create_usergroup("team90", "team90", "ictsc2021team90hotstage", False)

scripts/create_user.py

@@ -1,5 +1,6 @@
 from ictsc2021 import Rikka
 
+import sys
 import logging
 from http import client
 
@@ -8,7 +9,9 @@ def main():
     client.HTTPConnection.debuglevel = 1
     logging.basicConfig(level=logging.DEBUG)
 
-    rikka = Rikka(baseurl="https://ss.ictsc.net/api")
+    baseurl = sys.argv[0]
+
+    rikka = Rikka(baseurl="http://localhost:8080/api")
 
     ugn = input("user_group_name: ")
     ugo = input("user_group_organization: ")