From 49fe5fbf3db56fc466b8997b182ee135d7a4365d Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 25 Sep 2017 09:11:25 -0500 Subject: Move sql store code into store/sqlstore package (#7502) * move sql store code into store/sqlstore package * move non-sql constants back up to store * fix api test * derp --- store/sql_oauth_store.go | 569 ----------------------------------------------- 1 file changed, 569 deletions(-) delete mode 100644 store/sql_oauth_store.go (limited to 'store/sql_oauth_store.go') diff --git a/store/sql_oauth_store.go b/store/sql_oauth_store.go deleted file mode 100644 index 77cee7cf2..000000000 --- a/store/sql_oauth_store.go +++ /dev/null @@ -1,569 +0,0 @@ -// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. -// See License.txt for license information. - -package store - -import ( - "net/http" - "strings" - - "github.com/mattermost/gorp" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" -) - -type SqlOAuthStore struct { - SqlStore -} - -func NewSqlOAuthStore(sqlStore SqlStore) OAuthStore { - as := &SqlOAuthStore{sqlStore} - - for _, db := range sqlStore.GetAllConns() { - table := db.AddTableWithName(model.OAuthApp{}, "OAuthApps").SetKeys(false, "Id") - table.ColMap("Id").SetMaxSize(26) - table.ColMap("CreatorId").SetMaxSize(26) - table.ColMap("ClientSecret").SetMaxSize(128) - table.ColMap("Name").SetMaxSize(64) - table.ColMap("Description").SetMaxSize(512) - table.ColMap("CallbackUrls").SetMaxSize(1024) - table.ColMap("Homepage").SetMaxSize(256) - table.ColMap("IconURL").SetMaxSize(512) - - tableAuth := db.AddTableWithName(model.AuthData{}, "OAuthAuthData").SetKeys(false, "Code") - tableAuth.ColMap("UserId").SetMaxSize(26) - tableAuth.ColMap("ClientId").SetMaxSize(26) - tableAuth.ColMap("Code").SetMaxSize(128) - tableAuth.ColMap("RedirectUri").SetMaxSize(256) - tableAuth.ColMap("State").SetMaxSize(128) - tableAuth.ColMap("Scope").SetMaxSize(128) - - tableAccess := db.AddTableWithName(model.AccessData{}, "OAuthAccessData").SetKeys(false, "Token") - tableAccess.ColMap("ClientId").SetMaxSize(26) - tableAccess.ColMap("UserId").SetMaxSize(26) - tableAccess.ColMap("Token").SetMaxSize(26) - tableAccess.ColMap("RefreshToken").SetMaxSize(26) - tableAccess.ColMap("RedirectUri").SetMaxSize(256) - tableAccess.ColMap("Scope").SetMaxSize(128) - tableAccess.SetUniqueTogether("ClientId", "UserId") - } - - return as -} - -func (as SqlOAuthStore) CreateIndexesIfNotExists() { - as.CreateIndexIfNotExists("idx_oauthapps_creator_id", "OAuthApps", "CreatorId") - as.CreateIndexIfNotExists("idx_oauthaccessdata_client_id", "OAuthAccessData", "ClientId") - as.CreateIndexIfNotExists("idx_oauthaccessdata_user_id", "OAuthAccessData", "UserId") - as.CreateIndexIfNotExists("idx_oauthaccessdata_refresh_token", "OAuthAccessData", "RefreshToken") - as.CreateIndexIfNotExists("idx_oauthauthdata_client_id", "OAuthAuthData", "Code") -} - -func (as SqlOAuthStore) SaveApp(app *model.OAuthApp) StoreChannel { - - storeChannel := make(StoreChannel, 1) - - go func() { - result := StoreResult{} - - if len(app.Id) > 0 { - result.Err = model.NewAppError("SqlOAuthStore.SaveApp", "store.sql_oauth.save_app.existing.app_error", nil, "app_id="+app.Id, http.StatusBadRequest) - storeChannel <- result - close(storeChannel) - return - } - - app.PreSave() - if result.Err = app.IsValid(); result.Err != nil { - storeChannel <- result - close(storeChannel) - return - } - - if err := as.GetMaster().Insert(app); err != nil { - result.Err = model.NewAppError("SqlOAuthStore.SaveApp", "store.sql_oauth.save_app.save.app_error", nil, "app_id="+app.Id+", "+err.Error(), http.StatusInternalServerError) - } else { - result.Data = app - } - - storeChannel <- result - close(storeChannel) - }() - - return storeChannel -} - -func (as SqlOAuthStore) UpdateApp(app *model.OAuthApp) StoreChannel { - - storeChannel := make(StoreChannel, 1) - - go func() { - result := StoreResult{} - - app.PreUpdate() - - if result.Err = app.IsValid(); result.Err != nil { - storeChannel <- result - close(storeChannel) - return - } - - if oldAppResult, err := as.GetMaster().Get(model.OAuthApp{}, app.Id); err != nil { - result.Err = model.NewAppError("SqlOAuthStore.UpdateApp", "store.sql_oauth.update_app.finding.app_error", nil, "app_id="+app.Id+", "+err.Error(), http.StatusInternalServerError) - } else if oldAppResult == nil { - result.Err = model.NewAppError("SqlOAuthStore.UpdateApp", "store.sql_oauth.update_app.find.app_error", nil, "app_id="+app.Id, http.StatusBadRequest) - } else { - oldApp := oldAppResult.(*model.OAuthApp) - app.CreateAt = oldApp.CreateAt - app.CreatorId = oldApp.CreatorId - - if count, err := as.GetMaster().Update(app); err != nil { - result.Err = model.NewAppError("SqlOAuthStore.UpdateApp", "store.sql_oauth.update_app.updating.app_error", nil, "app_id="+app.Id+", "+err.Error(), http.StatusInternalServerError) - } else if count != 1 { - result.Err = model.NewAppError("SqlOAuthStore.UpdateApp", "store.sql_oauth.update_app.update.app_error", nil, "app_id="+app.Id, http.StatusBadRequest) - } else { - result.Data = [2]*model.OAuthApp{app, oldApp} - } - } - - storeChannel <- result - close(storeChannel) - }() - - return storeChannel -} - -func (as SqlOAuthStore) GetApp(id string) StoreChannel { - - storeChannel := make(StoreChannel, 1) - - go func() { - result := StoreResult{} - - if obj, err := as.GetReplica().Get(model.OAuthApp{}, id); err != nil { - result.Err = model.NewAppError("SqlOAuthStore.GetApp", "store.sql_oauth.get_app.finding.app_error", nil, "app_id="+id+", "+err.Error(), http.StatusInternalServerError) - } else if obj == nil { - result.Err = model.NewAppError("SqlOAuthStore.GetApp", "store.sql_oauth.get_app.find.app_error", nil, "app_id="+id, http.StatusNotFound) - } else { - result.Data = obj.(*model.OAuthApp) - } - - storeChannel <- result - close(storeChannel) - - }() - - return storeChannel -} - -func (as SqlOAuthStore) GetAppByUser(userId string, offset, limit int) StoreChannel { - - storeChannel := make(StoreChannel, 1) - - go func() { - result := StoreResult{} - - var apps []*model.OAuthApp - - if _, err := as.GetReplica().Select(&apps, "SELECT * FROM OAuthApps WHERE CreatorId = :UserId LIMIT :Limit OFFSET :Offset", map[string]interface{}{"UserId": userId, "Offset": offset, "Limit": limit}); err != nil { - result.Err = model.NewAppError("SqlOAuthStore.GetAppByUser", "store.sql_oauth.get_app_by_user.find.app_error", nil, "user_id="+userId+", "+err.Error(), http.StatusInternalServerError) - } - - result.Data = apps - - storeChannel <- result - close(storeChannel) - }() - - return storeChannel -} - -func (as SqlOAuthStore) GetApps(offset, limit int) StoreChannel { - - storeChannel := make(StoreChannel, 1) - - go func() { - result := StoreResult{} - - var apps []*model.OAuthApp - - if _, err := as.GetReplica().Select(&apps, "SELECT * FROM OAuthApps LIMIT :Limit OFFSET :Offset", map[string]interface{}{"Offset": offset, "Limit": limit}); err != nil { - result.Err = model.NewAppError("SqlOAuthStore.GetAppByUser", "store.sql_oauth.get_apps.find.app_error", nil, "err="+err.Error(), http.StatusInternalServerError) - } - - result.Data = apps - - storeChannel <- result - close(storeChannel) - }() - - return storeChannel -} - -func (as SqlOAuthStore) GetAuthorizedApps(userId string, offset, limit int) StoreChannel { - storeChannel := make(StoreChannel, 1) - - go func() { - result := StoreResult{} - - var apps []*model.OAuthApp - - if _, err := as.GetReplica().Select(&apps, - `SELECT o.* FROM OAuthApps AS o INNER JOIN - Preferences AS p ON p.Name=o.Id AND p.UserId=:UserId LIMIT :Limit OFFSET :Offset`, map[string]interface{}{"UserId": userId, "Offset": offset, "Limit": limit}); err != nil { - result.Err = model.NewAppError("SqlOAuthStore.GetAuthorizedApps", "store.sql_oauth.get_apps.find.app_error", nil, "err="+err.Error(), http.StatusInternalServerError) - } - - result.Data = apps - - storeChannel <- result - close(storeChannel) - }() - - return storeChannel -} - -func (as SqlOAuthStore) DeleteApp(id string) StoreChannel { - storeChannel := make(StoreChannel, 1) - - go func() { - result := StoreResult{} - - // wrap in a transaction so that if one fails, everything fails - transaction, err := as.GetMaster().Begin() - if err != nil { - result.Err = model.NewAppError("SqlOAuthStore.DeleteApp", "store.sql_oauth.delete.open_transaction.app_error", nil, err.Error(), http.StatusInternalServerError) - } else { - if extrasResult := as.deleteApp(transaction, id); extrasResult.Err != nil { - result = extrasResult - } - - if result.Err == nil { - if err := transaction.Commit(); err != nil { - // don't need to rollback here since the transaction is already closed - result.Err = model.NewAppError("SqlOAuthStore.DeleteApp", "store.sql_oauth.delete.commit_transaction.app_error", nil, err.Error(), http.StatusInternalServerError) - } - } else { - if err := transaction.Rollback(); err != nil { - result.Err = model.NewAppError("SqlOAuthStore.DeleteApp", "store.sql_oauth.delete.rollback_transaction.app_error", nil, err.Error(), http.StatusInternalServerError) - } - } - } - - storeChannel <- result - close(storeChannel) - }() - - return storeChannel -} - -func (as SqlOAuthStore) SaveAccessData(accessData *model.AccessData) StoreChannel { - - storeChannel := make(StoreChannel, 1) - - go func() { - result := StoreResult{} - - if result.Err = accessData.IsValid(); result.Err != nil { - storeChannel <- result - close(storeChannel) - return - } - - if err := as.GetMaster().Insert(accessData); err != nil { - result.Err = model.NewAppError("SqlOAuthStore.SaveAccessData", "store.sql_oauth.save_access_data.app_error", nil, err.Error(), http.StatusInternalServerError) - } else { - result.Data = accessData - } - - storeChannel <- result - close(storeChannel) - }() - - return storeChannel -} - -func (as SqlOAuthStore) GetAccessData(token string) StoreChannel { - - storeChannel := make(StoreChannel, 1) - - go func() { - result := StoreResult{} - - accessData := model.AccessData{} - - if err := as.GetReplica().SelectOne(&accessData, "SELECT * FROM OAuthAccessData WHERE Token = :Token", map[string]interface{}{"Token": token}); err != nil { - result.Err = model.NewAppError("SqlOAuthStore.GetAccessData", "store.sql_oauth.get_access_data.app_error", nil, err.Error(), http.StatusInternalServerError) - } else { - result.Data = &accessData - } - - storeChannel <- result - close(storeChannel) - - }() - - return storeChannel -} - -func (as SqlOAuthStore) GetAccessDataByUserForApp(userId, clientId string) StoreChannel { - - storeChannel := make(StoreChannel, 1) - - go func() { - result := StoreResult{} - - var accessData []*model.AccessData - - if _, err := as.GetReplica().Select(&accessData, - "SELECT * FROM OAuthAccessData WHERE UserId = :UserId AND ClientId = :ClientId", - map[string]interface{}{"UserId": userId, "ClientId": clientId}); err != nil { - result.Err = model.NewAppError("SqlOAuthStore.GetAccessDataByUserForApp", "store.sql_oauth.get_access_data_by_user_for_app.app_error", nil, "user_id="+userId+" client_id="+clientId, http.StatusInternalServerError) - } else { - result.Data = accessData - } - - storeChannel <- result - close(storeChannel) - - }() - - return storeChannel -} - -func (as SqlOAuthStore) GetAccessDataByRefreshToken(token string) StoreChannel { - - storeChannel := make(StoreChannel, 1) - - go func() { - result := StoreResult{} - - accessData := model.AccessData{} - - if err := as.GetReplica().SelectOne(&accessData, "SELECT * FROM OAuthAccessData WHERE RefreshToken = :Token", map[string]interface{}{"Token": token}); err != nil { - result.Err = model.NewAppError("SqlOAuthStore.GetAccessData", "store.sql_oauth.get_access_data.app_error", nil, err.Error(), http.StatusInternalServerError) - } else { - result.Data = &accessData - } - - storeChannel <- result - close(storeChannel) - - }() - - return storeChannel -} - -func (as SqlOAuthStore) GetPreviousAccessData(userId, clientId string) StoreChannel { - - storeChannel := make(StoreChannel, 1) - - go func() { - result := StoreResult{} - - accessData := model.AccessData{} - - if err := as.GetReplica().SelectOne(&accessData, "SELECT * FROM OAuthAccessData WHERE ClientId = :ClientId AND UserId = :UserId", - map[string]interface{}{"ClientId": clientId, "UserId": userId}); err != nil { - if strings.Contains(err.Error(), "no rows") { - result.Data = nil - } else { - result.Err = model.NewAppError("SqlOAuthStore.GetPreviousAccessData", "store.sql_oauth.get_previous_access_data.app_error", nil, err.Error(), http.StatusNotFound) - } - } else { - result.Data = &accessData - } - - storeChannel <- result - close(storeChannel) - - }() - - return storeChannel -} - -func (as SqlOAuthStore) UpdateAccessData(accessData *model.AccessData) StoreChannel { - storeChannel := make(StoreChannel, 1) - - go func() { - result := StoreResult{} - - if result.Err = accessData.IsValid(); result.Err != nil { - storeChannel <- result - close(storeChannel) - return - } - - if _, err := as.GetMaster().Exec("UPDATE OAuthAccessData SET Token = :Token, ExpiresAt = :ExpiresAt, RefreshToken = :RefreshToken WHERE ClientId = :ClientId AND UserID = :UserId", - map[string]interface{}{"Token": accessData.Token, "ExpiresAt": accessData.ExpiresAt, "RefreshToken": accessData.RefreshToken, "ClientId": accessData.ClientId, "UserId": accessData.UserId}); err != nil { - result.Err = model.NewAppError("SqlOAuthStore.Update", "store.sql_oauth.update_access_data.app_error", nil, - "clientId="+accessData.ClientId+",userId="+accessData.UserId+", "+err.Error(), http.StatusInternalServerError) - } else { - result.Data = accessData - } - - storeChannel <- result - close(storeChannel) - }() - - return storeChannel -} - -func (as SqlOAuthStore) RemoveAccessData(token string) StoreChannel { - storeChannel := make(StoreChannel, 1) - - go func() { - result := StoreResult{} - - if _, err := as.GetMaster().Exec("DELETE FROM OAuthAccessData WHERE Token = :Token", map[string]interface{}{"Token": token}); err != nil { - result.Err = model.NewAppError("SqlOAuthStore.RemoveAccessData", "store.sql_oauth.remove_access_data.app_error", nil, "err="+err.Error(), http.StatusInternalServerError) - } - - storeChannel <- result - close(storeChannel) - }() - - return storeChannel -} - -func (as SqlOAuthStore) SaveAuthData(authData *model.AuthData) StoreChannel { - - storeChannel := make(StoreChannel, 1) - - go func() { - result := StoreResult{} - - authData.PreSave() - if result.Err = authData.IsValid(); result.Err != nil { - storeChannel <- result - close(storeChannel) - return - } - - if err := as.GetMaster().Insert(authData); err != nil { - result.Err = model.NewAppError("SqlOAuthStore.SaveAuthData", "store.sql_oauth.save_auth_data.app_error", nil, err.Error(), http.StatusInternalServerError) - } else { - result.Data = authData - } - - storeChannel <- result - close(storeChannel) - }() - - return storeChannel -} - -func (as SqlOAuthStore) GetAuthData(code string) StoreChannel { - - storeChannel := make(StoreChannel, 1) - - go func() { - result := StoreResult{} - - if obj, err := as.GetReplica().Get(model.AuthData{}, code); err != nil { - result.Err = model.NewAppError("SqlOAuthStore.GetAuthData", "store.sql_oauth.get_auth_data.finding.app_error", nil, err.Error(), http.StatusInternalServerError) - } else if obj == nil { - result.Err = model.NewAppError("SqlOAuthStore.GetAuthData", "store.sql_oauth.get_auth_data.find.app_error", nil, "", http.StatusNotFound) - } else { - result.Data = obj.(*model.AuthData) - } - - storeChannel <- result - close(storeChannel) - - }() - - return storeChannel -} - -func (as SqlOAuthStore) RemoveAuthData(code string) StoreChannel { - storeChannel := make(StoreChannel, 1) - - go func() { - result := StoreResult{} - - _, err := as.GetMaster().Exec("DELETE FROM OAuthAuthData WHERE Code = :Code", map[string]interface{}{"Code": code}) - if err != nil { - result.Err = model.NewAppError("SqlOAuthStore.RemoveAuthData", "store.sql_oauth.remove_auth_data.app_error", nil, "err="+err.Error(), http.StatusInternalServerError) - } - - storeChannel <- result - close(storeChannel) - }() - - return storeChannel -} - -func (as SqlOAuthStore) PermanentDeleteAuthDataByUser(userId string) StoreChannel { - storeChannel := make(StoreChannel, 1) - - go func() { - result := StoreResult{} - - _, err := as.GetMaster().Exec("DELETE FROM OAuthAccessData WHERE UserId = :UserId", map[string]interface{}{"UserId": userId}) - if err != nil { - result.Err = model.NewAppError("SqlOAuthStore.RemoveAuthDataByUserId", "store.sql_oauth.permanent_delete_auth_data_by_user.app_error", nil, "err="+err.Error(), http.StatusInternalServerError) - } - - storeChannel <- result - close(storeChannel) - }() - - return storeChannel -} - -func (as SqlOAuthStore) deleteApp(transaction *gorp.Transaction, clientId string) StoreResult { - result := StoreResult{} - - if _, err := transaction.Exec("DELETE FROM OAuthApps WHERE Id = :Id", map[string]interface{}{"Id": clientId}); err != nil { - result.Err = model.NewAppError("SqlOAuthStore.DeleteApp", "store.sql_oauth.delete_app.app_error", nil, "id="+clientId+", err="+err.Error(), http.StatusInternalServerError) - return result - } - - return as.deleteOAuthAppSessions(transaction, clientId) -} - -func (as SqlOAuthStore) deleteOAuthAppSessions(transaction *gorp.Transaction, clientId string) StoreResult { - result := StoreResult{} - - query := "" - if *utils.Cfg.SqlSettings.DriverName == model.DATABASE_DRIVER_POSTGRES { - query = "DELETE FROM Sessions s USING OAuthAccessData o WHERE o.Token = s.Token AND o.ClientId = :Id" - } else if *utils.Cfg.SqlSettings.DriverName == model.DATABASE_DRIVER_MYSQL { - query = "DELETE s.* FROM Sessions s INNER JOIN OAuthAccessData o ON o.Token = s.Token WHERE o.ClientId = :Id" - } - - if _, err := transaction.Exec(query, map[string]interface{}{"Id": clientId}); err != nil { - result.Err = model.NewAppError("SqlOAuthStore.DeleteApp", "store.sql_oauth.delete_app.app_error", nil, "id="+clientId+", err="+err.Error(), http.StatusInternalServerError) - return result - } - - return as.deleteOAuthTokens(transaction, clientId) -} - -func (as SqlOAuthStore) deleteOAuthTokens(transaction *gorp.Transaction, clientId string) StoreResult { - result := StoreResult{} - - if _, err := transaction.Exec("DELETE FROM OAuthAccessData WHERE ClientId = :Id", map[string]interface{}{"Id": clientId}); err != nil { - result.Err = model.NewAppError("SqlOAuthStore.DeleteApp", "store.sql_oauth.delete_app.app_error", nil, "id="+clientId+", err="+err.Error(), http.StatusInternalServerError) - return result - } - - return as.deleteAppExtras(transaction, clientId) -} - -func (as SqlOAuthStore) deleteAppExtras(transaction *gorp.Transaction, clientId string) StoreResult { - result := StoreResult{} - - if _, err := transaction.Exec( - `DELETE FROM - Preferences - WHERE - Category = :Category - AND Name = :Name`, map[string]interface{}{"Category": model.PREFERENCE_CATEGORY_AUTHORIZED_OAUTH_APP, "Name": clientId}); err != nil { - result.Err = model.NewAppError("SqlOAuthStore.DeleteApp", "store.sql_preference.delete.app_error", nil, err.Error(), http.StatusInternalServerError) - return result - } - - return result -} -- cgit v1.2.3-1-g7c22