Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add disable user sign up #164

Merged
merged 1 commit into from
Nov 22, 2024
Merged

feat: add disable user sign up #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,11 @@ func apiStart(br *broker) {
return
}

if cfg.DisableSignUp {
c.Status(http.StatusForbidden)
return
}

db, err := instanceDB(cfg.DB)
if err != nil {
log.Error().Msg(err.Error())
Expand Down Expand Up @@ -398,6 +403,10 @@ func apiStart(br *broker) {
c.JSON(http.StatusOK, gin.H{"admin": isAdmin})
})

r.GET("/allowsignup", func(c *gin.Context) {
c.JSON(http.StatusOK, gin.H{"allow": !cfg.DisableSignUp})
})

r.GET("/users", func(c *gin.Context) {
loginUsername := getLoginUsername(c)
isAdmin := isAdminUsername(cfg, loginUsername)
Expand Down
7 changes: 5 additions & 2 deletions config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ type Config struct {
AddrDev string
AddrUser string
AddrHttpProxy string
DisableSignUp bool
HttpProxyRedirURL string
HttpProxyPort int
SslCert string
Expand Down Expand Up @@ -51,13 +52,14 @@ func Parse(c *cli.Context) *Config {
AddrDev: c.String("addr-dev"),
AddrUser: c.String("addr-user"),
AddrHttpProxy: c.String("addr-http-proxy"),
DisableSignUp: c.Bool("disable-sign-up"),
HttpProxyRedirURL: c.String("http-proxy-redir-url"),
SslCert: c.String("ssl-cert"),
SslKey: c.String("ssl-key"),
SslCacert: c.String("ssl-cacert"),
SeparateSslConfig: c.Bool("separate-ssl-config"),
WebUISslCert: c.String("webui-ssl-cert"),
WebUISslKey: c.String("webui-ssl-key"),
WebUISslCert: c.String("webui-ssl-cert"),
WebUISslKey: c.String("webui-ssl-key"),
Token: c.String("token"),
DB: c.String("db"),
LocalAuth: c.Bool("local-auth"),
Expand All @@ -80,6 +82,7 @@ func Parse(c *cli.Context) *Config {
getConfigOpt(yamlCfg, "addr-dev", &cfg.AddrDev)
getConfigOpt(yamlCfg, "addr-user", &cfg.AddrUser)
getConfigOpt(yamlCfg, "addr-http-proxy", &cfg.AddrHttpProxy)
getConfigOpt(yamlCfg, "disable-sign-up", &cfg.DisableSignUp)
getConfigOpt(yamlCfg, "http-proxy-redir-url", &cfg.HttpProxyRedirURL)
getConfigOpt(yamlCfg, "ssl-cert", &cfg.SslCert)
getConfigOpt(yamlCfg, "ssl-key", &cfg.SslKey)
Expand Down
3 changes: 3 additions & 0 deletions rttys.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,6 @@
# database source
db: sqlite://rttys.db
#db: mysql://rttys:rttys@tcp(localhost)/rttys

#disable new user sign up
#disable-sign-up: True
10 changes: 8 additions & 2 deletions ui/src/views/Login.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</FormItem>
</Form>
<p v-if="signup" style="text-align: center">{{ $t('Already have an account?') }}<a href="/login" style="text-decoration: none; color: #1c7cd6">{{ $t('Sign in') }}</a></p>
<p v-else style="text-align: center">{{ $t('New to Rttys?') }}<a href="/login?signup=1" style="text-decoration: none; color: #1c7cd6">{{ $t('Sign up') }}</a></p>
<p v-else-if="allowSignup" style="text-align: center">{{ $t('New to Rttys?') }}<a href="/login?signup=1" style="text-decoration: none; color: #1c7cd6">{{ $t('Sign up') }}</a></p>
</Card>
</template>

Expand All @@ -22,7 +22,8 @@ export default {
data() {
return {
signup: false,
formData: {
allowSignup: false,
formData: {
username: '',
password: ''
},
Expand Down Expand Up @@ -65,6 +66,11 @@ export default {
created() {
this.signup = this.$route.query.signup === '1';
sessionStorage.removeItem('rttys-sid');
this.axios.get('/allowsignup').then(response => {
this.allowSignup = response.data.allow;
}).catch(() => {
this.allowSignup = false;
});
}
}
</script>
Expand Down