chore(deps): update to CTFd 3.7.7 and add accounts blacklist support (#142)

Author: pandatix

.github/workflows/ci.yaml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       ctfd:
-        image: ctfd/ctfd:3.7.5@sha256:7f456b23727286c9df2b58e0b7398cc0196e2b74e4c1c5b3cda7a5b71034637d
+        image: ctfd/ctfd:3.7.7@sha256:9847758cdafc5ab86bdc121353dcf5a27a29ce313587270ee90a71bfbda2b910
         ports:
           - 8000:8000
     steps:

action.yaml

@@ -39,6 +39,8 @@ inputs:
   # Accounts
   accounts_domain_whitelist:
     description: 'The domain whitelist (a list separated by colons) to allow users to have email addresses from.'
+  accounts_domain_blacklist:
+    description: 'The domain blacklist (a list separated by colons) to block users to have email addresses from.'
   accounts_verify_emails:
     description: 'Whether to verify emails once a user register or not.'
     default: 'false'
@@ -169,6 +171,7 @@ runs:
     THEME_FOOTER: ${{ inputs.theme_footer }}
     THEME_SETTINGS: ${{ inputs.theme_settings }}
     ACCOUNTS_DOMAIN_WHITELIST: ${{ inputs.accounts_domain_whitelist }}
+    ACCOUNTS_DOMAIN_BLACKLIST: ${{ inputs.accounts_domain_blacklist }}
     ACCOUNTS_VERIFY_EMAILS: ${{ inputs.accounts_verify_emails }}
     ACCOUNTS_TEAM_CREATION: ${{ inputs.accounts_team_creation }}
     ACCOUNTS_TEAM_SIZE: ${{ inputs.accounts_team_size }}

cmd/ctfd-setup/main.go

@@ -129,6 +129,12 @@ func main() {
 				EnvVars:  []string{"ACCOUNTS_DOMAIN_WHITELIST", "PLUGIN_ACCOUNTS_DOMAIN_WHITELIST"},
 				Category: configuration,
 			},
+			&cli.StringFlag{
+				Name:     "accounts.domain_blacklist",
+				Usage:    "The domain blacklist (a list separated by colons) to block users to have email addresses from.",
+				EnvVars:  []string{"ACCOUNTS_DOMAIN_BLACKLIST", "PLUGIN_ACCOUNTS_DOMAIN_BLACKLIST"},
+				Category: configuration,
+			},
 			&cli.BoolFlag{
 				Name:     "accounts.verify_emails",
 				Usage:    "Whether to verify emails once a user register or not.",
@@ -534,6 +540,7 @@ func run(ctx *cli.Context) error {
 		},
 		Accounts: &ctfdsetup.Accounts{
 			DomainWhitelist:               stringPtr(ctx, "accounts.domain_whitelist"),
+			DomainBlacklist:               stringPtr(ctx, "accounts.domain_blacklist"),
 			VerifyEmails:                  ctx.Bool("accounts.verify_emails"),
 			TeamCreation:                  boolPtr(ctx, "accounts.team_creation"),
 			TeamSize:                      intPtr(ctx, "accounts.team_size"),

config.go

@@ -74,6 +74,9 @@ type (
 		// The domain whitelist (a list separated by colons) to allow users to have email addresses from.
 		DomainWhitelist *string `yaml:"domain_whitelist,omitempty" json:"domain_whitelist,omitempty"`
 
+		// The domain blacklist (a list separated by colons) to blocks users to have email addresses from.
+		DomainBlacklist *string `yaml:"domain_blacklist,omitempty" json:"domain_blacklist,omitempty"`
+
 		// Whether to verify emails once a user register or not.
 		VerifyEmails bool `yaml:"verify_emails,omitempty" json:"verify_emails,omitempty"`
 

go.mod

@@ -3,7 +3,7 @@ module github.com/ctfer-io/ctfd-setup
 go 1.22.2
 
 require (
-	github.com/ctfer-io/go-ctfd v0.11.0
+	github.com/ctfer-io/go-ctfd v0.12.0
 	github.com/invopop/jsonschema v0.13.0
 	github.com/pkg/errors v0.9.1
 	github.com/stretchr/testify v1.10.0

go.sum

@@ -4,8 +4,8 @@ github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMU
 github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
 github.com/cpuguy83/go-md2man/v2 v2.0.5 h1:ZtcqGrnekaHpVLArFSe4HK5DoKx1T0rq2DwVB0alcyc=
 github.com/cpuguy83/go-md2man/v2 v2.0.5/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/ctfer-io/go-ctfd v0.11.0 h1:4Rdya1kgT5clYuoLmIeRBplTVLJoLUVGcp7DE4GfwoE=
-github.com/ctfer-io/go-ctfd v0.11.0/go.mod h1:ebgSW8LdP/qtRCpglK4djBp+g6kU5YM98XBZKowiCeY=
+github.com/ctfer-io/go-ctfd v0.12.0 h1:HiftQofP/NQ7FlHfc8dqYM5fuLAlGkv2bP3KbveA8bk=
+github.com/ctfer-io/go-ctfd v0.12.0/go.mod h1:ebgSW8LdP/qtRCpglK4djBp+g6kU5YM98XBZKowiCeY=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

setup.go

@@ -95,6 +95,7 @@ func updateSetup(ctx context.Context, client *api.Client, conf *Config) error {
 			return errors.Wrap(err, "patching CTF logo")
 		}
 	}
+	// TODO else delete logo
 
 	// Push small icon
 	if conf.Theme.SmallIcon.Name != "" {
@@ -112,6 +113,7 @@ func updateSetup(ctx context.Context, client *api.Client, conf *Config) error {
 			return errors.Wrap(err, "patching CTF small icon")
 		}
 	}
+	// TODO else delete small icon
 
 	// Update configs attributes
 	params := &api.PatchConfigsParams{
@@ -123,6 +125,7 @@ func updateSetup(ctx context.Context, client *api.Client, conf *Config) error {
 		ThemeHeader:                        ptr(string(conf.Theme.Header.Content)),
 		ThemeSettings:                      ptr(string(conf.Theme.Settings.Content)),
 		DomainWhitelist:                    conf.Accounts.DomainWhitelist,
+		DomainBlacklist:                    conf.Accounts.DomainBlacklist,
 		IncorrectSubmissionsPerMin:         conf.Accounts.IncorrectSubmissionsPerMinute,
 		NameChanges:                        conf.Accounts.NameChanges,
 		NumTeams:                           conf.Accounts.NumTeams,