Updated geodb

- Updated geoip table
- Fixed bug in streamproxy delete in dev version
- Commented SSO related features (WIP) for release
This commit is contained in:
Toby Chui 2024-10-27 16:35:59 +08:00
parent 5f64b622b5
commit f927bb539a
5 changed files with 51958 additions and 30830 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -220,6 +220,11 @@ func (m *Manager) EditConfig(configUUID string, newName string, newListeningAddr
} }
func (m *Manager) RemoveConfig(configUUID string) error { func (m *Manager) RemoveConfig(configUUID string) error {
//Remove the config from file
err := os.Remove(filepath.Join(m.Options.ConfigStore, configUUID+".config"))
if err != nil {
return err
}
// Find and remove the config with the specified UUID // Find and remove the config with the specified UUID
for i, config := range m.Configs { for i, config := range m.Configs {
if config.UUID == configUUID { if config.UUID == configUUID {

View File

@ -12,7 +12,6 @@ import (
"imuslab.com/zoraxy/mod/access" "imuslab.com/zoraxy/mod/access"
"imuslab.com/zoraxy/mod/acme" "imuslab.com/zoraxy/mod/acme"
"imuslab.com/zoraxy/mod/auth" "imuslab.com/zoraxy/mod/auth"
"imuslab.com/zoraxy/mod/auth/sso"
"imuslab.com/zoraxy/mod/database" "imuslab.com/zoraxy/mod/database"
"imuslab.com/zoraxy/mod/dockerux" "imuslab.com/zoraxy/mod/dockerux"
"imuslab.com/zoraxy/mod/dynamicproxy/loadbalance" "imuslab.com/zoraxy/mod/dynamicproxy/loadbalance"
@ -128,19 +127,21 @@ func startupSequence() {
panic(err) panic(err)
} }
//Create an SSO handler /*
ssoHandler, err = sso.NewSSOHandler(&sso.SSOConfig{ //Create an SSO handler
SystemUUID: nodeUUID, ssoHandler, err = sso.NewSSOHandler(&sso.SSOConfig{
PortalServerPort: 5488, SystemUUID: nodeUUID,
AuthURL: "http://auth.localhost", PortalServerPort: 5488,
Database: sysdb, AuthURL: "http://auth.localhost",
Logger: SystemWideLogger, Database: sysdb,
}) Logger: SystemWideLogger,
if err != nil { })
log.Fatal(err) if err != nil {
} log.Fatal(err)
//Restore the SSO handler to previous state before shutdown }
ssoHandler.RestorePreviousRunningState() //Restore the SSO handler to previous state before shutdown
ssoHandler.RestorePreviousRunningState()
*/
//Create a statistic collector //Create a statistic collector
statisticCollector, err = statistic.NewStatisticCollector(statistic.CollectorOption{ statisticCollector, err = statistic.NewStatisticCollector(statistic.CollectorOption{

View File

@ -1,3 +1,14 @@
<div class="standardContainer">
<div class="ui basic segment">
<div class="ui message">
<div class="header">
Work in Progress
</div>
<p>The SSO feature is currently under development.</p>
</div>
</div>
</div>
<!--
<div class="standardContainer"> <div class="standardContainer">
<div class="ui basic segment"> <div class="ui basic segment">
<h2>Zoraxy SSO / Oauth</h2> <h2>Zoraxy SSO / Oauth</h2>
@ -366,4 +377,5 @@
//Open the registered user management snippet //Open the registered user management snippet
showSideWrapper("snippet/sso_user.html"); showSideWrapper("snippet/sso_user.html");
} }
</script> </script>
-->