feat(storage): add native PostgreSQL runtime and verified offline application import
Build and publish container images / images (push) Failing after 12m29s
Build and publish container images / images (push) Failing after 12m29s
This commit is contained in:
1 parent
96065d1e89
commit
0ba1dcfef0
243 files changed
+21441
-3090
No files matched your search
+101
-46
@@ -24,6 +24,9 @@ type UserSpacePage struct {
|
||||
}
|
||||
|
||||
func (s *Store) EnsureUserSpaceSchema() error {
|
||||
if s.sqlBackend == storePostgreSQL {
|
||||
return s.ensurePostgreSQLUserSpace(context.Background())
|
||||
}
|
||||
for _, query := range []string{
|
||||
`CREATE TABLE IF NOT EXISTS user_space_policies(
|
||||
domain_uuid TEXT NOT NULL, principal_uuid TEXT NOT NULL,
|
||||
@@ -86,20 +89,20 @@ func (s *Store) domainAllowsUserSpacePublic(ctx context.Context, q interface {
|
||||
SELECT 1 FROM domains d JOIN campuses c ON c.uuid=d.campus_uuid
|
||||
JOIN config cfg ON cfg.domain_uuid=d.uuid AND cfg.key='authorization_mode' AND cfg.value='enforcing'
|
||||
JOIN locality_publication_policies p ON p.domain_uuid=d.uuid AND p.node_kind='domain' AND p.node_uuid=d.uuid AND p.policy='public'
|
||||
WHERE d.uuid=? AND d.enabled=1 AND c.enabled=1)`, domain).Scan(&allowed)
|
||||
WHERE d.uuid=`+s.sqlParam(1)+` AND d.enabled=1 AND c.enabled=1)`, domain).Scan(&allowed)
|
||||
return allowed, err
|
||||
}
|
||||
|
||||
func loadUserSpacePolicy(ctx context.Context, q interface {
|
||||
func (s *Store) loadUserSpacePolicy(ctx context.Context, q interface {
|
||||
QueryRowContext(context.Context, string, ...any) *sql.Row
|
||||
QueryContext(context.Context, string, ...any) (*sql.Rows, error)
|
||||
}, domain, principal, username string) (UserSpacePolicy, error) {
|
||||
p := defaultUserSpacePolicy(principal, username)
|
||||
err := q.QueryRowContext(ctx, `SELECT profile_visibility,avatar_visibility,root_visibility,descendant_visibility,version FROM user_space_policies WHERE domain_uuid=? AND principal_uuid=?`, domain, principal).Scan(&p.ProfileVisibility, &p.AvatarVisibility, &p.RootVisibility, &p.DescendantVisibility, &p.Version)
|
||||
err := q.QueryRowContext(ctx, `SELECT profile_visibility,avatar_visibility,root_visibility,descendant_visibility,version FROM user_space_policies WHERE domain_uuid=`+s.sqlParam(1)+` AND principal_uuid=`+s.sqlParam(2)+``, domain, principal).Scan(&p.ProfileVisibility, &p.AvatarVisibility, &p.RootVisibility, &p.DescendantVisibility, &p.Version)
|
||||
if err != nil && err != sql.ErrNoRows {
|
||||
return p, err
|
||||
}
|
||||
rows, err := q.QueryContext(ctx, `SELECT path,visibility FROM user_space_path_policies WHERE domain_uuid=? AND principal_uuid=? ORDER BY path LIMIT ?`, domain, principal, MaxUserSpaceOverrides+1)
|
||||
rows, err := q.QueryContext(ctx, `SELECT path,visibility FROM user_space_path_policies WHERE domain_uuid=`+s.sqlParam(1)+` AND principal_uuid=`+s.sqlParam(2)+` ORDER BY path LIMIT `+s.sqlParam(3)+``, domain, principal, MaxUserSpaceOverrides+1)
|
||||
if err != nil {
|
||||
return p, err
|
||||
}
|
||||
@@ -120,18 +123,38 @@ func loadUserSpacePolicy(ctx context.Context, q interface {
|
||||
return p, nil
|
||||
}
|
||||
|
||||
func (s *Store) UserSpacePolicy(ctx context.Context, domain, principal string) (UserSpacePolicy, error) {
|
||||
ctx, cancel := context.WithTimeout(ctx, 2*time.Second)
|
||||
defer cancel()
|
||||
var username string
|
||||
if err := s.DB.QueryRowContext(ctx, `SELECT i.subject FROM principal_identities i JOIN domain_memberships m ON m.principal_uuid=i.principal_uuid AND m.domain_uuid=? AND m.state='active' JOIN principals p ON p.uuid=i.principal_uuid AND p.state IN ('active','readonly') WHERE i.principal_uuid=? AND i.provider_type='password'`, domain, principal).Scan(&username); err != nil {
|
||||
type userSpaceQuery interface {
|
||||
QueryRowContext(context.Context, string, ...any) *sql.Row
|
||||
QueryContext(context.Context, string, ...any) (*sql.Rows, error)
|
||||
}
|
||||
|
||||
func (s *Store) UserSpacePolicy(ctx context.Context, domain, principal string) (p UserSpacePolicy, err error) {
|
||||
err = s.policyRead(ctx, func(ctx context.Context, tx *sql.Tx) error {
|
||||
var e error
|
||||
p, e = s.userSpacePolicyOn(ctx, tx, domain, principal)
|
||||
return e
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
func (s *Store) userSpacePolicyByUsername(ctx context.Context, q userSpaceQuery, domain, username string) (UserSpacePolicy, error) {
|
||||
var principal string
|
||||
if err := q.QueryRowContext(ctx, `SELECT i.principal_uuid FROM principal_identities i JOIN domain_memberships m ON m.principal_uuid=i.principal_uuid AND m.domain_uuid=`+s.sqlParam(1)+` WHERE i.provider_type='password' AND i.subject=`+s.sqlParam(2), domain, username).Scan(&principal); err != nil {
|
||||
return UserSpacePolicy{}, err
|
||||
}
|
||||
p, err := loadUserSpacePolicy(ctx, s.DB, domain, principal, username)
|
||||
return s.userSpacePolicyOn(ctx, q, domain, principal)
|
||||
}
|
||||
|
||||
func (s *Store) userSpacePolicyOn(ctx context.Context, q userSpaceQuery, domain, principal string) (UserSpacePolicy, error) {
|
||||
var username string
|
||||
if err := q.QueryRowContext(ctx, `SELECT i.subject FROM principal_identities i JOIN domain_memberships m ON m.principal_uuid=i.principal_uuid AND m.domain_uuid=`+s.sqlParam(1)+` AND m.state='active' JOIN principals p ON p.uuid=i.principal_uuid AND p.state IN ('active','readonly') WHERE i.principal_uuid=`+s.sqlParam(2)+` AND i.provider_type='password'`, domain, principal).Scan(&username); err != nil {
|
||||
return UserSpacePolicy{}, err
|
||||
}
|
||||
p, err := s.loadUserSpacePolicy(ctx, q, domain, principal, username)
|
||||
if err != nil {
|
||||
return p, err
|
||||
}
|
||||
p.DomainAllowsPublic, err = s.domainAllowsUserSpacePublic(ctx, s.DB, domain)
|
||||
p.DomainAllowsPublic, err = s.domainAllowsUserSpacePublic(ctx, q, domain)
|
||||
return p, err
|
||||
}
|
||||
|
||||
@@ -143,21 +166,28 @@ func EffectiveUserSpaceVisibility(p UserSpacePolicy, target string) string {
|
||||
return userSpaceEffectiveVisibility(p, target)
|
||||
}
|
||||
|
||||
func renameUserSpacePathPoliciesTx(tx *sql.Tx, domain, oldPath, newPath string, recursive bool) error {
|
||||
func (s *Store) renameUserSpacePathPoliciesTx(tx *sql.Tx, domain, oldPath, newPath string, recursive bool) error {
|
||||
// Path mutation is also used by small maintenance/test stores that predate
|
||||
// the optional authentication schemas. Keep the core rename primitive usable
|
||||
// there; a fully opened application Store always creates this table.
|
||||
var tableExists bool
|
||||
if err := tx.QueryRow(`SELECT EXISTS(SELECT 1 FROM sqlite_master WHERE type='table' AND name='user_space_path_policies')`).Scan(&tableExists); err != nil {
|
||||
existsSQL := `SELECT EXISTS(SELECT 1 FROM sqlite_master WHERE type='table' AND name='user_space_path_policies')`
|
||||
if s.sqlBackend == storePostgreSQL {
|
||||
existsSQL = `SELECT to_regclass('user_space_path_policies') IS NOT NULL`
|
||||
}
|
||||
if err := tx.QueryRow(existsSQL).Scan(&tableExists); err != nil {
|
||||
return err
|
||||
}
|
||||
if !tableExists {
|
||||
if s.sqlBackend == storePostgreSQL {
|
||||
return ErrPostgreSQLComponentNotReady
|
||||
}
|
||||
return nil
|
||||
}
|
||||
query := `SELECT usp.principal_uuid,usp.path,i.subject FROM user_space_path_policies usp JOIN principal_identities i ON i.principal_uuid=usp.principal_uuid AND i.provider_type='password' WHERE usp.domain_uuid=? AND usp.path=?`
|
||||
query := `SELECT usp.principal_uuid,usp.path,i.subject FROM user_space_path_policies usp JOIN principal_identities i ON i.principal_uuid=usp.principal_uuid AND i.provider_type='password' WHERE usp.domain_uuid=` + s.sqlParam(1) + ` AND usp.path=` + s.sqlParam(2) + ``
|
||||
args := []any{domain, oldPath}
|
||||
if recursive {
|
||||
query = `SELECT usp.principal_uuid,usp.path,i.subject FROM user_space_path_policies usp JOIN principal_identities i ON i.principal_uuid=usp.principal_uuid AND i.provider_type='password' WHERE usp.domain_uuid=? AND (usp.path=? OR substr(usp.path,1,length(?)+1)=?||'/') ORDER BY length(usp.path) DESC`
|
||||
query = `SELECT usp.principal_uuid,usp.path,i.subject FROM user_space_path_policies usp JOIN principal_identities i ON i.principal_uuid=usp.principal_uuid AND i.provider_type='password' WHERE usp.domain_uuid=` + s.sqlParam(1) + ` AND (usp.path=` + s.sqlParam(2) + ` OR substr(usp.path,1,length(` + s.sqlParam(3) + `)+1)=` + s.sqlParam(4) + `||'/') ORDER BY length(usp.path) DESC`
|
||||
args = []any{domain, oldPath, oldPath, oldPath}
|
||||
}
|
||||
rows, err := tx.Query(query, args...)
|
||||
@@ -185,33 +215,37 @@ func renameUserSpacePathPoliciesTx(tx *sql.Tx, domain, oldPath, newPath string,
|
||||
}
|
||||
rows.Close()
|
||||
for _, item := range moves {
|
||||
if _, err = tx.Exec(`UPDATE user_space_path_policies SET path=? WHERE domain_uuid=? AND principal_uuid=? AND path=?`, item.new, domain, item.principal, item.old); err != nil {
|
||||
if _, err = tx.Exec(`UPDATE user_space_path_policies SET path=`+s.sqlParam(1)+` WHERE domain_uuid=`+s.sqlParam(2)+` AND principal_uuid=`+s.sqlParam(3)+` AND path=`+s.sqlParam(4)+``, item.new, domain, item.principal, item.old); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *Store) SaveUserSpacePolicy(ctx context.Context, domain, actor string, proposed UserSpacePolicy) (UserSpacePolicy, error) {
|
||||
func (s *Store) SaveUserSpacePolicy(ctx context.Context, domain, actor string, proposed UserSpacePolicy) (_ UserSpacePolicy, resultErr error) {
|
||||
defer func() { resultErr = s.sqlError("SaveUserSpacePolicy", resultErr) }()
|
||||
if s.ReadOnly {
|
||||
return UserSpacePolicy{}, ErrReadOnly
|
||||
}
|
||||
ctx, cancel := context.WithTimeout(ctx, 3*time.Second)
|
||||
defer cancel()
|
||||
tx, err := s.DB.BeginTx(ctx, nil)
|
||||
tx, err := s.DB.BeginTx(ctx, &sql.TxOptions{Isolation: sql.LevelReadCommitted})
|
||||
if err != nil {
|
||||
return UserSpacePolicy{}, err
|
||||
}
|
||||
defer tx.Rollback()
|
||||
// Reserve the writer before authority and ceiling checks.
|
||||
if _, err = tx.ExecContext(ctx, `INSERT INTO navigation_generation(id,version) VALUES(1,1) ON CONFLICT(id) DO UPDATE SET version=version`); err != nil {
|
||||
if err = s.lockPolicyWrite(ctx, tx); err != nil {
|
||||
return UserSpacePolicy{}, err
|
||||
}
|
||||
var username string
|
||||
if err = tx.QueryRowContext(ctx, `SELECT i.subject FROM principal_identities i JOIN domain_memberships m ON m.principal_uuid=i.principal_uuid AND m.domain_uuid=? AND m.state='active' JOIN principals p ON p.uuid=i.principal_uuid AND p.state='active' WHERE i.principal_uuid=? AND i.provider_type='password'`, domain, actor).Scan(&username); err != nil {
|
||||
if err = tx.QueryRowContext(ctx, `SELECT i.subject FROM principal_identities i JOIN domain_memberships m ON m.principal_uuid=i.principal_uuid AND m.domain_uuid=`+s.sqlParam(1)+` AND m.state='active' JOIN principals p ON p.uuid=i.principal_uuid AND p.state='active' WHERE i.principal_uuid=`+s.sqlParam(2)+` AND i.provider_type='password'`, domain, actor).Scan(&username); err != nil {
|
||||
return UserSpacePolicy{}, ErrAccessDenied
|
||||
}
|
||||
if proposed.PrincipalUUID != "" && proposed.PrincipalUUID != actor || proposed.Username != "" && proposed.Username != username {
|
||||
return UserSpacePolicy{}, ErrAccessDenied
|
||||
}
|
||||
current, err := loadUserSpacePolicy(ctx, tx, domain, actor, username)
|
||||
current, err := s.loadUserSpacePolicy(ctx, tx, domain, actor, username)
|
||||
if err != nil {
|
||||
return UserSpacePolicy{}, err
|
||||
}
|
||||
@@ -242,7 +276,7 @@ func (s *Store) SaveUserSpacePolicy(ctx context.Context, domain, actor string, p
|
||||
}
|
||||
seen[item.Path] = true
|
||||
var exists bool
|
||||
if err = tx.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM paths WHERE domain_uuid=? AND path=?)`, domain, item.Path).Scan(&exists); err != nil || !exists {
|
||||
if err = tx.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM paths WHERE domain_uuid=`+s.sqlParam(1)+` AND path=`+s.sqlParam(2)+`)`, domain, item.Path).Scan(&exists); err != nil || !exists {
|
||||
return current, ErrGovernanceInvalid
|
||||
}
|
||||
}
|
||||
@@ -250,20 +284,20 @@ func (s *Store) SaveUserSpacePolicy(ctx context.Context, domain, actor string, p
|
||||
proposed.PrincipalUUID, proposed.Username, proposed.DomainAllowsPublic = actor, username, allowed
|
||||
before, _ := json.Marshal(current)
|
||||
now := time.Now().UnixMilli()
|
||||
if _, err = tx.ExecContext(ctx, `INSERT INTO user_space_policies(domain_uuid,principal_uuid,profile_visibility,avatar_visibility,root_visibility,descendant_visibility,version,actor_uuid,updated_at_ms) VALUES(?,?,?,?,?,?,1,?,?) ON CONFLICT(domain_uuid,principal_uuid) DO UPDATE SET profile_visibility=excluded.profile_visibility,avatar_visibility=excluded.avatar_visibility,root_visibility=excluded.root_visibility,descendant_visibility=excluded.descendant_visibility,version=user_space_policies.version+1,actor_uuid=excluded.actor_uuid,updated_at_ms=excluded.updated_at_ms`, domain, actor, proposed.ProfileVisibility, proposed.AvatarVisibility, proposed.RootVisibility, proposed.DescendantVisibility, actor, now); err != nil {
|
||||
if _, err = tx.ExecContext(ctx, `INSERT INTO user_space_policies(domain_uuid,principal_uuid,profile_visibility,avatar_visibility,root_visibility,descendant_visibility,version,actor_uuid,updated_at_ms) VALUES(`+s.sqlParam(1)+`,`+s.sqlParam(2)+`,`+s.sqlParam(3)+`,`+s.sqlParam(4)+`,`+s.sqlParam(5)+`,`+s.sqlParam(6)+`,1,`+s.sqlParam(7)+`,`+s.sqlParam(8)+`) ON CONFLICT(domain_uuid,principal_uuid) DO UPDATE SET profile_visibility=excluded.profile_visibility,avatar_visibility=excluded.avatar_visibility,root_visibility=excluded.root_visibility,descendant_visibility=excluded.descendant_visibility,version=user_space_policies.version+1,actor_uuid=excluded.actor_uuid,updated_at_ms=excluded.updated_at_ms`, domain, actor, proposed.ProfileVisibility, proposed.AvatarVisibility, proposed.RootVisibility, proposed.DescendantVisibility, actor, now); err != nil {
|
||||
return current, err
|
||||
}
|
||||
if _, err = tx.ExecContext(ctx, `DELETE FROM user_space_path_policies WHERE domain_uuid=? AND principal_uuid=?`, domain, actor); err != nil {
|
||||
if _, err = tx.ExecContext(ctx, `DELETE FROM user_space_path_policies WHERE domain_uuid=`+s.sqlParam(1)+` AND principal_uuid=`+s.sqlParam(2)+``, domain, actor); err != nil {
|
||||
return current, err
|
||||
}
|
||||
for _, item := range proposed.Overrides {
|
||||
if _, err = tx.ExecContext(ctx, `INSERT INTO user_space_path_policies VALUES(?,?,?,?,?,?)`, domain, actor, item.Path, item.Visibility, actor, now); err != nil {
|
||||
if _, err = tx.ExecContext(ctx, `INSERT INTO user_space_path_policies VALUES(`+s.sqlParam(1)+`,`+s.sqlParam(2)+`,`+s.sqlParam(3)+`,`+s.sqlParam(4)+`,`+s.sqlParam(5)+`,`+s.sqlParam(6)+`)`, domain, actor, item.Path, item.Visibility, actor, now); err != nil {
|
||||
return current, err
|
||||
}
|
||||
}
|
||||
proposed.Version = current.Version + 1
|
||||
after, _ := json.Marshal(proposed)
|
||||
if _, err = tx.ExecContext(ctx, `INSERT INTO user_space_policy_events(domain_uuid,principal_uuid,actor_uuid,before_json,after_json,created_at_ms) VALUES(?,?,?,?,?,?)`, domain, actor, actor, string(before), string(after), now); err != nil {
|
||||
if _, err = tx.ExecContext(ctx, `INSERT INTO user_space_policy_events(domain_uuid,principal_uuid,actor_uuid,before_json,after_json,created_at_ms) VALUES(`+s.sqlParam(1)+`,`+s.sqlParam(2)+`,`+s.sqlParam(3)+`,`+s.sqlParam(4)+`,`+s.sqlParam(5)+`,`+s.sqlParam(6)+`)`, domain, actor, actor, string(before), string(after), now); err != nil {
|
||||
return current, err
|
||||
}
|
||||
if err = tx.Commit(); err != nil {
|
||||
@@ -272,15 +306,23 @@ func (s *Store) SaveUserSpacePolicy(ctx context.Context, domain, actor string, p
|
||||
return proposed, nil
|
||||
}
|
||||
|
||||
func (s *Store) ListUserSpacePages(ctx context.Context, domain, principal string, limit int) ([]UserSpacePage, error) {
|
||||
func (s *Store) ListUserSpacePages(ctx context.Context, domain, principal string, limit int) (_ []UserSpacePage, resultErr error) {
|
||||
defer func() { resultErr = s.sqlError("ListUserSpacePages", resultErr) }()
|
||||
if limit <= 0 || limit > MaxNavigationEntries {
|
||||
limit = 512
|
||||
}
|
||||
p, err := s.UserSpacePolicy(ctx, domain, principal)
|
||||
ctx, cancel := context.WithTimeout(ctx, 2*time.Second)
|
||||
defer cancel()
|
||||
tx, err := s.DB.BeginTx(ctx, s.policyReadOptions())
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
rows, err := s.DB.QueryContext(ctx, `SELECT path FROM paths WHERE domain_uuid=? AND path LIKE ? ESCAPE '\' ORDER BY path LIMIT ?`, domain, escapeUserSpaceLike(userSpaceRoot(p.Username))+"/%", limit+1)
|
||||
defer tx.Rollback()
|
||||
p, err := s.userSpacePolicyOn(ctx, tx, domain, principal)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
rows, err := tx.QueryContext(ctx, `SELECT path FROM paths WHERE domain_uuid=`+s.sqlParam(1)+` AND path LIKE `+s.sqlParam(2)+` ESCAPE '\' ORDER BY path LIMIT `+s.sqlParam(3)+``, domain, escapeUserSpaceLike(userSpaceRoot(p.Username))+"/%", limit+1)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -308,7 +350,8 @@ func (s *Store) ListUserSpacePages(ctx context.Context, domain, principal string
|
||||
return result, rows.Err()
|
||||
}
|
||||
|
||||
func (s *Store) UserSpaceCanReadAuthenticated(ctx context.Context, domain, viewer, target string) (bool, error) {
|
||||
func (s *Store) UserSpaceCanReadAuthenticated(ctx context.Context, domain, viewer, target string) (_ bool, resultErr error) {
|
||||
defer func() { resultErr = s.sqlError("UserSpaceCanReadAuthenticated", resultErr) }()
|
||||
parts := strings.Split(strings.TrimPrefix(target, "/u/"), "/")
|
||||
if len(parts) == 0 || parts[0] == "" {
|
||||
return false, nil
|
||||
@@ -351,22 +394,27 @@ func chooseRevisionLanguage(items []*Revision, languages []string) (*Revision, e
|
||||
return items[0], nil
|
||||
}
|
||||
|
||||
func (s *Store) PublicUserSpaceRevision(ctx context.Context, domain, username, target string, languages []string) (*Revision, error) {
|
||||
func (s *Store) PublicUserSpaceRevision(ctx context.Context, domain, username, target string, languages []string) (_ *Revision, resultErr error) {
|
||||
defer func() { resultErr = s.sqlError("PublicUserSpaceRevision", resultErr) }()
|
||||
ctx, cancel := context.WithTimeout(ctx, 2*time.Second)
|
||||
defer cancel()
|
||||
owner, err := s.PrincipalByUsername(domain, username)
|
||||
tx, err := s.DB.BeginTx(ctx, s.policyReadOptions())
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
p, err := s.UserSpacePolicy(ctx, domain, owner.UUID)
|
||||
if err != nil || !p.DomainAllowsPublic || userSpaceEffectiveVisibility(p, target) != "public" {
|
||||
defer tx.Rollback()
|
||||
p, err := s.userSpacePolicyByUsername(ctx, tx, domain, username)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if !p.DomainAllowsPublic || userSpaceEffectiveVisibility(p, target) != "public" {
|
||||
return nil, sql.ErrNoRows
|
||||
}
|
||||
rows, err := s.DB.QueryContext(ctx, `SELECT r.uuid,r.object_uuid,r.document_hash,COALESCE(NULLIF(r.lang,''),'und'),COALESCE(NULLIF(r.content_type,''),'text/html; charset=utf-8'),COALESCE(r.filename,''),r.created_at_ms
|
||||
rows, err := tx.QueryContext(ctx, `SELECT r.uuid,r.object_uuid,r.document_hash,COALESCE(NULLIF(r.lang,''),'und'),COALESCE(NULLIF(r.content_type,''),'text/html; charset=utf-8'),COALESCE(r.filename,''),r.created_at_ms
|
||||
FROM paths p JOIN revisions r ON r.object_uuid=p.object_uuid
|
||||
WHERE p.domain_uuid=? AND p.path=?
|
||||
WHERE p.domain_uuid=`+s.sqlParam(1)+` AND p.path=`+s.sqlParam(2)+`
|
||||
AND NOT EXISTS(SELECT 1 FROM paths other WHERE other.object_uuid=p.object_uuid AND (other.domain_uuid!=p.domain_uuid OR other.path!=p.path))
|
||||
AND r.uuid=(SELECT head.uuid FROM revisions head WHERE head.object_uuid=r.object_uuid AND COALESCE(NULLIF(head.lang,''),'und')=COALESCE(NULLIF(r.lang,''),'und') ORDER BY head.created_at_ms DESC,head.rowid DESC LIMIT 1)
|
||||
AND r.uuid=(SELECT head.uuid FROM revisions head WHERE head.object_uuid=r.object_uuid AND COALESCE(NULLIF(head.lang,''),'und')=COALESCE(NULLIF(r.lang,''),'und') ORDER BY `+s.revisionHeadOrder("head.")+` LIMIT 1)
|
||||
ORDER BY r.created_at_ms DESC,r.uuid LIMIT 33`, domain, target)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
@@ -386,30 +434,37 @@ func (s *Store) PublicUserSpaceRevision(ctx context.Context, domain, username, t
|
||||
return chooseRevisionLanguage(items, languages)
|
||||
}
|
||||
|
||||
func (s *Store) PublicUserSpaceNavigation(ctx context.Context, domain, username string) ([]PublishedNavigationPage, error) {
|
||||
func (s *Store) PublicUserSpaceNavigation(ctx context.Context, domain, username string) (_ []PublishedNavigationPage, resultErr error) {
|
||||
defer func() { resultErr = s.sqlError("PublicUserSpaceNavigation", resultErr) }()
|
||||
ctx, cancel := context.WithTimeout(ctx, 2*time.Second)
|
||||
defer cancel()
|
||||
owner, err := s.PrincipalByUsername(domain, username)
|
||||
tx, err := s.DB.BeginTx(ctx, s.policyReadOptions())
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
p, err := s.UserSpacePolicy(ctx, domain, owner.UUID)
|
||||
if err != nil || !p.DomainAllowsPublic {
|
||||
defer tx.Rollback()
|
||||
p, err := s.userSpacePolicyByUsername(ctx, tx, domain, username)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if !p.DomainAllowsPublic {
|
||||
return nil, sql.ErrNoRows
|
||||
}
|
||||
root := userSpaceRoot(username)
|
||||
rows, err := s.DB.QueryContext(ctx, `SELECT p.path,r.uuid,r.object_uuid,r.document_hash,COALESCE(NULLIF(r.lang,''),'und'),COALESCE(NULLIF(r.content_type,''),'text/html; charset=utf-8'),COALESCE(r.filename,''),r.created_at_ms
|
||||
rows, err := tx.QueryContext(ctx, `SELECT p.path,r.uuid,r.object_uuid,r.document_hash,COALESCE(NULLIF(r.lang,''),'und'),COALESCE(NULLIF(r.content_type,''),'text/html; charset=utf-8'),COALESCE(r.filename,''),r.created_at_ms
|
||||
FROM paths p JOIN revisions r ON r.object_uuid=p.object_uuid
|
||||
WHERE p.domain_uuid=? AND (p.path=? OR p.path LIKE ? ESCAPE '\')
|
||||
WHERE p.domain_uuid=`+s.sqlParam(1)+` AND (p.path=`+s.sqlParam(2)+` OR p.path LIKE `+s.sqlParam(3)+` ESCAPE '\')
|
||||
AND NOT EXISTS(SELECT 1 FROM paths other WHERE other.object_uuid=p.object_uuid AND (other.domain_uuid!=p.domain_uuid OR other.path!=p.path))
|
||||
AND r.uuid=(SELECT head.uuid FROM revisions head WHERE head.object_uuid=r.object_uuid AND COALESCE(NULLIF(head.lang,''),'und')=COALESCE(NULLIF(r.lang,''),'und') ORDER BY head.created_at_ms DESC,head.rowid DESC LIMIT 1)
|
||||
ORDER BY p.path,r.created_at_ms DESC,r.uuid LIMIT ?`, domain, root, escapeUserSpaceLike(root)+"/%", MaxNavigationEntries+1)
|
||||
AND r.uuid=(SELECT head.uuid FROM revisions head WHERE head.object_uuid=r.object_uuid AND COALESCE(NULLIF(head.lang,''),'und')=COALESCE(NULLIF(r.lang,''),'und') ORDER BY `+s.revisionHeadOrder("head.")+` LIMIT 1)
|
||||
ORDER BY p.path,r.created_at_ms DESC,r.uuid LIMIT `+s.sqlParam(4)+``, domain, root, escapeUserSpaceLike(root)+"/%", MaxNavigationEntries+1)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
result := []PublishedNavigationPage{}
|
||||
scanned := 0
|
||||
for rows.Next() {
|
||||
scanned++
|
||||
var item PublishedNavigationPage
|
||||
v := &item.Revision
|
||||
if err = rows.Scan(&item.Path, &v.UUID, &v.ObjectUUID, &v.DocumentHash, &v.Language, &v.ContentType, &v.Filename, &v.CreatedAtMS); err != nil {
|
||||
@@ -422,7 +477,7 @@ func (s *Store) PublicUserSpaceNavigation(ctx context.Context, domain, username
|
||||
if err = rows.Err(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if len(result) > MaxNavigationEntries {
|
||||
if scanned > MaxNavigationEntries {
|
||||
return nil, ErrNavigationBudget
|
||||
}
|
||||
return result, nil
|
||||
|
||||
Reference in new issue
Block a user