Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

add single tenant HOST_MODE

goenning7f2eb2f45b1d
diff --git a/.ci.env b/.ci.env
index 266e26954..cc8d590e8 100644
--- a/.ci.env
+++ b/.ci.env
@@ -1,4 +1,5 @@
GO_ENV=test
+HOST_MODE=multi
DATABASE_URL=postgres://wechy_test:wechy_test-pw@postgres:5432/wechy_test?sslmode=disable
AUTH_ENDPOINT=http://login.test.canhearyou.com:3000
JWT_SECRET=I1$$MplJ-007A8]G#RE0VVfvv:I~o6+2yA0@)>2|{K$Z1628z9;w7lAsZ
\ No newline at end of file
diff --git a/.test.env b/.test.env
index 2d016cef8..a35876f6d 100644
--- a/.test.env
+++ b/.test.env
@@ -1,4 +1,5 @@
GO_ENV=test
+HOST_MODE=multi
DATABASE_URL=postgres://wechy_test:wechy_test-pw@localhost:5566/wechy_test?sslmode=disable
AUTH_ENDPOINT=http://login.test.canhearyou.com:3000
JWT_SECRET=I1$$MplJ-007A8]G#RE0VVfvv:I~o6+2yA0@)>2|{K$Z1628z9;w7lAsZ
\ No newline at end of file
diff --git a/Makefile b/Makefile
index b8afc858d..c31ad32b8 100644
--- a/Makefile
+++ b/Makefile
@@ -12,16 +12,6 @@ test:
coverage:
godotenv -f ${ENV_FILE} ./cover.sh $$(go list ./... | grep -v /vendor/)
-old-coverage:
- rm -rf coverage.txt
- for d in $$(go list ./... | grep -v vendor); do \
- godotenv -f ${ENV_FILE} go test -p=1 -race -coverprofile=profile.out -coverpkg=github.com/WeCanHearYou/wechy/app/... -covermode=atomic $$d ; \
- if [ -f profile.out ]; then \
- cat profile.out >> coverage.txt ; \
- rm profile.out ; \
- fi \
- done
-
build:
go build -a -ldflags='-X main.buildtime=${BUILD_TIME}' -o wechy .
diff --git a/app/handlers/identity.go b/app/handlers/identity.go
index 351acd8e7..5232c5eb4 100644
--- a/app/handlers/identity.go
+++ b/app/handlers/identity.go
@@ -46,12 +46,18 @@ func (h OAuthHandlers) Callback(provider string) web.HandlerFunc {
return c.Redirect(http.StatusTemporaryRedirect, redirect)
}
- tenant, err := h.tenants.GetByDomain(stripPort(redirectURL.Host))
- if err != nil {
- return c.Failure(err)
+ tenant := c.Tenant()
+ if tenant == nil {
+ // should get from context
+ // Single/Multi middleware should handle auth endpoint properly
+ // .Set("AuthEndpoint") is not good as well
+ tenant, err = h.tenants.GetByDomain(stripPort(redirectURL.Host))
+ if err != nil {
+ return c.Failure(err)
+ }
}
- oauthUser, err := h.oauth.GetProfile(provider, code)
+ oauthUser, err := h.oauth.GetProfile(c.AuthEndpoint(), provider, code)
if err != nil {
return c.Failure(err)
}
@@ -111,7 +117,7 @@ func (h OAuthHandlers) Callback(provider string) web.HandlerFunc {
// Login handles OAuth logins
func (h OAuthHandlers) Login(provider string) web.HandlerFunc {
return func(c web.Context) error {
- authURL := h.oauth.GetAuthURL(provider, c.QueryParam("redirect"))
+ authURL := h.oauth.GetAuthURL(c.AuthEndpoint(), provider, c.QueryParam("redirect"))
return c.Redirect(http.StatusTemporaryRedirect, authURL)
}
}
diff --git a/app/handlers/identity_test.go b/app/handlers/identity_test.go
index e230072b6..4d7f57208 100644
--- a/app/handlers/identity_test.go
+++ b/app/handlers/identity_test.go
@@ -26,6 +26,7 @@ func TestLoginHandler(t *testing.T) {
RegisterTestingT(t)
server := mock.NewServer()
+ server.Context.Set("__CTX_AUTH_ENDPOINT", "http://login.test.canherayou.com:3000")
code, response := server.ExecuteRaw(oauthHandlers.Login(oauth.FacebookProvider))
Expect(code).To(Equal(http.StatusTemporaryRedirect))
diff --git a/app/middlewares/domain.go b/app/middlewares/domain.go
index 15b945860..3cf99fb03 100644
--- a/app/middlewares/domain.go
+++ b/app/middlewares/domain.go
@@ -4,15 +4,54 @@ import (
"net/http"
"net/url"
+ "github.com/WeCanHearYou/wechy/app"
+ "github.com/WeCanHearYou/wechy/app/models"
+ "github.com/WeCanHearYou/wechy/app/pkg/env"
"github.com/WeCanHearYou/wechy/app/pkg/web"
"github.com/WeCanHearYou/wechy/app/storage"
)
+// Tenant adds either SingleTenant or MultiTenant to the pipeline
+func Tenant(tenants storage.Tenant) web.MiddlewareFunc {
+ if env.HostMode() == "single" {
+ return SingleTenant(tenants)
+ }
+ return MultiTenant(tenants)
+}
+
+// SingleTenant inject default tenant into current context
+func SingleTenant(tenants storage.Tenant) web.MiddlewareFunc {
+ return func(next web.HandlerFunc) web.HandlerFunc {
+ return func(c web.Context) error {
+ tenant, err := tenants.First()
+ if err == app.ErrNotFound {
+ tenant := &models.Tenant{
+ Name: "Default",
+ Subdomain: "default",
+ }
+ tenants.Add(tenant)
+ }
+
+ c.SetTenant(tenant)
+ return next(c)
+ }
+ }
+}
+
// MultiTenant extract tenant information from hostname and inject it into current context
func MultiTenant(tenants storage.Tenant) web.MiddlewareFunc {
return func(next web.HandlerFunc) web.HandlerFunc {
return func(c web.Context) error {
hostname := stripPort(c.Request().Host)
+ u, err := url.Parse(c.AuthEndpoint())
+ if err != nil {
+ return c.Failure(err)
+ }
+
+ if hostname == stripPort(u.Host) {
+ return next(c)
+ }
+
tenant, err := tenants.GetByDomain(hostname)
if err == nil {
c.SetTenant(tenant)
diff --git a/app/middlewares/domain_test.go b/app/middlewares/domain_test.go
index 50b60565d..68c54a490 100644
--- a/app/middlewares/domain_test.go
+++ b/app/middlewares/domain_test.go
@@ -79,6 +79,29 @@ func TestMultiTenant_UnknownDomain(t *testing.T) {
Expect(rec.Code).To(Equal(404))
}
+func TestSingleTenant(t *testing.T) {
+ RegisterTestingT(t)
+
+ tenants := &inmemory.TenantStorage{}
+ server := mock.NewServer()
+ req, _ := http.NewRequest(echo.GET, "/", nil)
+ rec := httptest.NewRecorder()
+ c := server.NewContext(req, rec)
+ c.Request().Host = "somedomain.com"
+
+ mw := middlewares.SingleTenant(tenants)
+ mw(func(c web.Context) error {
+ return c.NoContent(http.StatusOK)
+ })(c)
+
+ tenant, err := tenants.First()
+
+ Expect(rec.Code).To(Equal(200))
+ Expect(err).To(BeNil())
+ Expect(tenant.Name).To(Equal("Default"))
+ Expect(tenant.Subdomain).To(Equal("default"))
+}
+
func TestHostChecker(t *testing.T) {
RegisterTestingT(t)
diff --git a/app/pkg/env/env.go b/app/pkg/env/env.go
index a4859befa..6a329736e 100644
--- a/app/pkg/env/env.go
+++ b/app/pkg/env/env.go
@@ -26,6 +26,11 @@ func MustGet(name string) string {
return value
}
+// HostMode returns current host mode
+func HostMode() string {
+ return GetEnvOrDefault("HOST_MODE", "single")
+}
+
// GetCurrentDomain returns Wechy domain based on current environment variables
func GetCurrentDomain() string {
env := os.Getenv("GO_ENV")
diff --git a/app/pkg/oauth/http.go b/app/pkg/oauth/http.go
index 58320b10e..49ec3d9f4 100644
--- a/app/pkg/oauth/http.go
+++ b/app/pkg/oauth/http.go
@@ -16,37 +16,40 @@ import (
type providerSettings struct {
profileURL func(token *oauth2.Token) string
- config *oauth2.Config
+ config func(authEndpoint string) *oauth2.Config
}
var (
- authEndpoint = os.Getenv("AUTH_ENDPOINT")
oauthSettings = map[string]*providerSettings{
FacebookProvider: &providerSettings{
profileURL: func(token *oauth2.Token) string {
return "https://graph.facebook.com/me?fields=name,email&access_token=" + url.QueryEscape(token.AccessToken)
},
- config: &oauth2.Config{
- ClientID: os.Getenv("OAUTH_FACEBOOK_APPID"),
- ClientSecret: os.Getenv("OAUTH_FACEBOOK_SECRET"),
- RedirectURL: authEndpoint + "/oauth/facebook/callback",
- Scopes: []string{"public_profile", "email"},
- Endpoint: facebook.Endpoint,
+ config: func(authEndpoint string) *oauth2.Config {
+ return &oauth2.Config{
+ ClientID: os.Getenv("OAUTH_FACEBOOK_APPID"),
+ ClientSecret: os.Getenv("OAUTH_FACEBOOK_SECRET"),
+ RedirectURL: authEndpoint + "/oauth/facebook/callback",
+ Scopes: []string{"public_profile", "email"},
+ Endpoint: facebook.Endpoint,
+ }
},
},
GoogleProvider: &providerSettings{
profileURL: func(token *oauth2.Token) string {
return "https://www.googleapis.com/oauth2/v2/userinfo?access_token=" + url.QueryEscape(token.AccessToken)
},
- config: &oauth2.Config{
- ClientID: os.Getenv("OAUTH_GOOGLE_CLIENTID"),
- ClientSecret: os.Getenv("OAUTH_GOOGLE_SECRET"),
- RedirectURL: authEndpoint + "/oauth/google/callback",
- Scopes: []string{
- "https://www.googleapis.com/auth/userinfo.profile",
- "https://www.googleapis.com/auth/userinfo.email",
- },
- Endpoint: google.Endpoint,
+ config: func(authEndpoint string) *oauth2.Config {
+ return &oauth2.Config{
+ ClientID: os.Getenv("OAUTH_GOOGLE_CLIENTID"),
+ ClientSecret: os.Getenv("OAUTH_GOOGLE_SECRET"),
+ RedirectURL: authEndpoint + "/oauth/google/callback",
+ Scopes: []string{
+ "https://www.googleapis.com/auth/userinfo.profile",
+ "https://www.googleapis.com/auth/userinfo.email",
+ },
+ Endpoint: google.Endpoint,
+ }
},
},
}
@@ -72,8 +75,8 @@ func doGet(url string, v interface{}) error {
type HTTPService struct{}
//GetAuthURL returns authentication url for given provider
-func (p *HTTPService) GetAuthURL(provider string, redirect string) string {
- config := oauthSettings[provider].config
+func (p *HTTPService) GetAuthURL(authEndpoint string, provider string, redirect string) string {
+ config := oauthSettings[provider].config(authEndpoint)
authURL, _ := url.Parse(config.Endpoint.AuthURL)
parameters := url.Values{}
@@ -87,9 +90,9 @@ func (p *HTTPService) GetAuthURL(provider string, redirect string) string {
}
//GetProfile returns user profile based on provider and code
-func (p *HTTPService) GetProfile(provider string, code string) (*UserProfile, error) {
+func (p *HTTPService) GetProfile(authEndpoint string, provider string, code string) (*UserProfile, error) {
settings := oauthSettings[provider]
- oauthToken, err := settings.config.Exchange(oauth2.NoContext, code)
+ oauthToken, err := settings.config(authEndpoint).Exchange(oauth2.NoContext, code)
if err != nil {
return nil, fmt.Errorf("OAuth code Exchange for %s failed with %s", provider, err)
}
diff --git a/app/pkg/oauth/http_test.go b/app/pkg/oauth/http_test.go
index 48d86ebce..7ffb436ae 100644
--- a/app/pkg/oauth/http_test.go
+++ b/app/pkg/oauth/http_test.go
@@ -11,7 +11,7 @@ func TestGetAuthURL_Facebook(t *testing.T) {
RegisterTestingT(t)
svc := &oauth.HTTPService{}
- authURL := svc.GetAuthURL(oauth.FacebookProvider, "")
+ authURL := svc.GetAuthURL("http://login.test.canhearyou.com:3000", oauth.FacebookProvider, "")
Expect(authURL).To(Equal("https://www.facebook.com/dialog/oauth?client_id=&redirect_uri=http%3A%2F%2Flogin.test.canhearyou.com%3A3000%2Foauth%2Ffacebook%2Fcallback&response_type=code&scope=public_profile+email&state="))
}
@@ -20,7 +20,7 @@ func TestGetAuthURL_Google(t *testing.T) {
RegisterTestingT(t)
svc := &oauth.HTTPService{}
- authURL := svc.GetAuthURL(oauth.GoogleProvider, "")
+ authURL := svc.GetAuthURL("http://login.test.canhearyou.com:3000", oauth.GoogleProvider, "")
Expect(authURL).To(Equal("https://accounts.google.com/o/oauth2/auth?client_id=&redirect_uri=http%3A%2F%2Flogin.test.canhearyou.com%3A3000%2Foauth%2Fgoogle%2Fcallback&response_type=code&scope=https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fuserinfo.profile+https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fuserinfo.email&state="))
}
diff --git a/app/pkg/oauth/mock.go b/app/pkg/oauth/mock.go
index f292a82d2..1f57ccd29 100644
--- a/app/pkg/oauth/mock.go
+++ b/app/pkg/oauth/mock.go
@@ -4,12 +4,12 @@ package oauth
type MockOAuthService struct{}
//GetAuthURL returns authentication url for given provider
-func (p *MockOAuthService) GetAuthURL(provider string, redirect string) string {
+func (p *MockOAuthService) GetAuthURL(authEndpoint string, provider string, redirect string) string {
return "http://orange.test.canherayou.com/oauth/token?provider=" + provider + "&redirect=" + redirect
}
//GetProfile returns user profile based on provider and code
-func (p *MockOAuthService) GetProfile(provider string, code string) (*UserProfile, error) {
+func (p *MockOAuthService) GetProfile(authEndpoint string, provider string, code string) (*UserProfile, error) {
if provider == "facebook" && code == "123" {
return &UserProfile{
ID: "FB1234",
diff --git a/app/pkg/oauth/oauth.go b/app/pkg/oauth/oauth.go
index 1b1f877de..eddfafe32 100644
--- a/app/pkg/oauth/oauth.go
+++ b/app/pkg/oauth/oauth.go
@@ -16,6 +16,6 @@ type UserProfile struct {
//Service provides OAuth operations
type Service interface {
- GetAuthURL(provider string, redirect string) string
- GetProfile(provider string, code string) (*UserProfile, error)
+ GetAuthURL(authEndpoint string, provider string, redirect string) string
+ GetProfile(authEndpoint string, provider string, code string) (*UserProfile, error)
}
diff --git a/app/pkg/web/context.go b/app/pkg/web/context.go
index de08b0098..a6924654c 100644
--- a/app/pkg/web/context.go
+++ b/app/pkg/web/context.go
@@ -5,13 +5,15 @@ import (
"strconv"
"github.com/WeCanHearYou/wechy/app/models"
+ "github.com/WeCanHearYou/wechy/app/pkg/env"
"github.com/labstack/echo"
)
var (
- preffixKey = "__CTX_"
- tenantContextKey = preffixKey + "TENANT"
- userContextKey = preffixKey + "USER"
+ preffixKey = "__CTX_"
+ tenantContextKey = preffixKey + "TENANT"
+ userContextKey = preffixKey + "USER"
+ authEndpointContextKey = preffixKey + "AUTH_ENDPOINT"
)
//Context wraps echo.context to provide userful WeCHY information
@@ -67,6 +69,25 @@ func (ctx *Context) SetUser(claims *models.User) {
ctx.Set(userContextKey, claims)
}
+//AuthEndpoint auth endpoint
+func (ctx *Context) AuthEndpoint() string {
+ endpoint, ok := ctx.Get(authEndpointContextKey).(string)
+ if !ok {
+ mode := env.HostMode()
+ if mode == "single" {
+ protocol := "http"
+ if ctx.Request().TLS != nil {
+ protocol = "https"
+ }
+ endpoint = protocol + "://" + ctx.Request().Host
+ } else {
+ endpoint = env.MustGet("AUTH_ENDPOINT")
+ }
+ ctx.Set(authEndpointContextKey, endpoint)
+ }
+ return endpoint
+}
+
//ParamAsInt returns parameter as int
func (ctx *Context) ParamAsInt(name string) (int, error) {
val, err := strconv.Atoi(ctx.Param(name))
diff --git a/app/pkg/web/renderer.go b/app/pkg/web/renderer.go
index fb9c8d7c1..54d0ff6f7 100644
--- a/app/pkg/web/renderer.go
+++ b/app/pkg/web/renderer.go
@@ -59,6 +59,7 @@ func (r *HTMLRenderer) Render(w io.Writer, name string, data interface{}, c echo
m := data.(echo.Map)
m["tenant"] = ctx.Tenant()
+ m["authEndpoint"] = ctx.Get("AuthEndpoint")
m["settings"] = r.settings
if ctx.IsAuthenticated() {
diff --git a/app/storage/identity.go b/app/storage/identity.go
index 0eb4d07c7..80735bcf1 100644
--- a/app/storage/identity.go
+++ b/app/storage/identity.go
@@ -12,5 +12,7 @@ type User interface {
// Tenant contains read and write operations for tenants
type Tenant interface {
+ Add(tenant *models.Tenant) error
+ First() (*models.Tenant, error)
GetByDomain(domain string) (*models.Tenant, error)
}
diff --git a/app/storage/inmemory/tenant.go b/app/storage/inmemory/tenant.go
index fc4ed9243..3e6f63e35 100644
--- a/app/storage/inmemory/tenant.go
+++ b/app/storage/inmemory/tenant.go
@@ -18,10 +18,18 @@ func (s *TenantStorage) Add(tenant *models.Tenant) error {
return nil
}
+// First returns first tenant
+func (s *TenantStorage) First() (*models.Tenant, error) {
+ for _, tenant := range s.tenants {
+ return tenant, nil
+ }
+
+ return nil, app.ErrNotFound
+}
+
// GetByDomain returns a tenant based on its domain
func (s *TenantStorage) GetByDomain(domain string) (*models.Tenant, error) {
for _, tenant := range s.tenants {
-
if tenant.Subdomain == extractSubdomain(domain) {
return tenant, nil
}
diff --git a/app/storage/postgres/tenant.go b/app/storage/postgres/tenant.go
index b34d3e7b6..d78a5da45 100644
--- a/app/storage/postgres/tenant.go
+++ b/app/storage/postgres/tenant.go
@@ -2,6 +2,7 @@ package postgres
import (
"strings"
+ "time"
"database/sql"
@@ -15,6 +16,32 @@ type TenantStorage struct {
DB *dbx.Database
}
+// Add given tenant to tenant list
+func (s *TenantStorage) Add(tenant *models.Tenant) error {
+ row := s.DB.QueryRow(`INSERT INTO tenants (name, subdomain, created_on)
+ VALUES ($1, $2, $3)
+ RETURNING id`, tenant.Name, tenant.Subdomain, time.Now())
+ if err := row.Scan(&tenant.ID); err != nil {
+ return err
+ }
+
+ return nil
+}
+
+// First returns first tenant
+func (s *TenantStorage) First() (*models.Tenant, error) {
+ tenant := models.Tenant{}
+
+ err := s.DB.Get(&tenant, "SELECT id, name, subdomain FROM tenants LIMIT 1")
+ if err == sql.ErrNoRows {
+ return nil, app.ErrNotFound
+ } else if err != nil {
+ return nil, err
+ }
+
+ return &tenant, nil
+}
+
// GetByDomain returns a tenant based on its domain
func (s *TenantStorage) GetByDomain(domain string) (*models.Tenant, error) {
tenant := models.Tenant{}
diff --git a/main.go b/main.go
index 231ac9f98..d3ca05365 100644
--- a/main.go
+++ b/main.go
@@ -49,11 +49,10 @@ func main() {
User: &postgres.UserStorage{DB: db},
Tenant: &postgres.TenantStorage{DB: db},
Settings: &models.WeCHYSettings{
- BuildTime: buildtime,
- Version: version,
- AuthEndpoint: env.MustGet("AUTH_ENDPOINT"),
- Compiler: runtime.Version(),
- Environment: env.Current(),
+ BuildTime: buildtime,
+ Version: version,
+ Compiler: runtime.Version(),
+ Environment: env.Current(),
},
}
diff --git a/public/components/social_signin_button.tsx b/public/components/social_signin_button.tsx
index a5c626272..c9f4bc0be 100644
--- a/public/components/social_signin_button.tsx
+++ b/public/components/social_signin_button.tsx
@@ -18,7 +18,7 @@ export class SocialSignInButton extends React.Component<SocialSignInButtonProps,
}
public render() {
- const authEndpoint = get<any>("settings").AuthEndpoint;
+ const authEndpoint = get<string>("authEndpoint");
const providerClassName = this.props.provider === "google" ? "google plus" : "facebook";
const providerDisplayName = this.props.provider === "google" ? "Google" : "Facebook";
const oauthUrl = `${authEndpoint}/oauth/${this.props.provider}?redirect=${location.href}`;
diff --git a/router.go b/router.go
index fa368d7e5..77bfb0593 100644
--- a/router.go
+++ b/router.go
@@ -6,7 +6,6 @@ import (
"github.com/WeCanHearYou/wechy/app/handlers"
"github.com/WeCanHearYou/wechy/app/middlewares"
"github.com/WeCanHearYou/wechy/app/models"
- "github.com/WeCanHearYou/wechy/app/pkg/env"
"github.com/WeCanHearYou/wechy/app/pkg/oauth"
"github.com/WeCanHearYou/wechy/app/pkg/web"
"github.com/WeCanHearYou/wechy/app/storage"
@@ -33,7 +32,7 @@ func GetMainEngine(ctx *WeCHYServices) *web.Engine {
public := r.Group("")
{
- public.Use(middlewares.MultiTenant(ctx.Tenant))
+ public.Use(middlewares.Tenant(ctx.Tenant))
public.Use(middlewares.JwtGetter(ctx.User))
public.Use(middlewares.JwtSetter())
@@ -45,7 +44,7 @@ func GetMainEngine(ctx *WeCHYServices) *web.Engine {
private := r.Group("")
{
- private.Use(middlewares.MultiTenant(ctx.Tenant))
+ private.Use(middlewares.Tenant(ctx.Tenant))
private.Use(middlewares.JwtGetter(ctx.User))
private.Use(middlewares.JwtSetter())
private.Use(middlewares.IsAuthenticated())
@@ -58,8 +57,8 @@ func GetMainEngine(ctx *WeCHYServices) *web.Engine {
auth := r.Group("/oauth")
{
+ auth.Use(middlewares.Tenant(ctx.Tenant))
authHandlers := handlers.OAuth(ctx.Tenant, ctx.OAuth, ctx.User)
- auth.Use(middlewares.HostChecker(env.MustGet("AUTH_ENDPOINT")))
auth.Get("/facebook", authHandlers.Login(oauth.FacebookProvider))
auth.Get("/facebook/callback", authHandlers.Callback(oauth.FacebookProvider))
@@ -69,7 +68,7 @@ func GetMainEngine(ctx *WeCHYServices) *web.Engine {
admin := r.Group("/admin")
{
- admin.Use(middlewares.MultiTenant(ctx.Tenant))
+ admin.Use(middlewares.Tenant(ctx.Tenant))
admin.Use(middlewares.JwtGetter(ctx.User))
admin.Use(middlewares.JwtSetter())
admin.Use(middlewares.IsAuthenticated())