feat(storage): add native PostgreSQL runtime and verified offline application import
Build and publish container images / images (push) Failing after 12m29s

This commit is contained in:
Anya Tokugawa committed 2026-11-15 05:47:14 +09:00
1 parent 96065d1e89
commit 0ba1dcfef0
243 files changed
+21441 -3090

No files matched your search

+50 -25
View File
@@ -292,11 +292,11 @@ func buildContact(old Contact, c Contact) (Contact, error) {
parsed.Deleted = c.Deleted
return parsed, e
}
func contactEnabled(ctx context.Context, q interface {
func (s *Store) contactEnabled(ctx context.Context, q interface {
QueryRowContext(context.Context, string, ...any) *sql.Row
}, domain string) error {
var raw string
err := q.QueryRowContext(ctx, `SELECT value FROM config WHERE domain_uuid=? AND key='system_extension_states'`, domain).Scan(&raw)
err := q.QueryRowContext(ctx, `SELECT value FROM config WHERE domain_uuid=`+s.sqlParam(1)+` AND key='system_extension_states'`, domain).Scan(&raw)
if errors.Is(err, sql.ErrNoRows) || err == nil && raw == "" {
return nil
}
@@ -312,20 +312,26 @@ func contactEnabled(ctx context.Context, q interface {
}
return nil
}
func (s *Store) Contacts(ctx context.Context, domain, actor, query, after string) ([]Contact, string, error) {
func (s *Store) Contacts(ctx context.Context, domain, actor, query, after string) (result []Contact, nextResult string, resultErr error) {
defer func() { resultErr = s.sqlError("contacts repository", resultErr) }()
return s.ListContacts(ctx, domain, actor, query, after, false)
}
func (s *Store) ListContacts(ctx context.Context, domain, actor, query, after string, deleted bool) ([]Contact, string, error) {
if err := taskActor(ctx, s.DB, domain, actor, false); err != nil {
func (s *Store) ListContacts(ctx context.Context, domain, actor, query, after string, deleted bool) (result []Contact, nextResult string, resultErr error) {
defer func() { resultErr = s.sqlError("contacts repository", resultErr) }()
if err := s.taskActor(ctx, s.DB, domain, actor, false); err != nil {
return nil, "", err
}
if err := contactEnabled(ctx, s.DB, domain); err != nil {
if err := s.contactEnabled(ctx, s.DB, domain); err != nil {
return nil, "", err
}
if len(query) > 200 {
return nil, "", ErrTaskInvalid
}
rows, err := s.DB.QueryContext(ctx, `SELECT data FROM organizer_contacts WHERE domain_uuid=? AND owner_uuid=? AND deleted=? AND uuid>? AND instr(search,?)>0 ORDER BY uuid LIMIT 101`, domain, actor, deleted, after, strings.ToLower(query))
contains := "instr"
if s.sqlBackend == storePostgreSQL {
contains = "strpos"
}
rows, err := s.DB.QueryContext(ctx, `SELECT data FROM organizer_contacts WHERE domain_uuid=`+s.sqlParam(1)+` AND owner_uuid=`+s.sqlParam(2)+` AND deleted=`+s.sqlParam(3)+` AND uuid>`+s.sqlParam(4)+` AND `+contains+`(search,`+s.sqlParam(5)+`)>0 ORDER BY uuid LIMIT 101`, domain, actor, boolToInt(deleted), after, strings.ToLower(query))
if err != nil {
return nil, "", err
}
@@ -350,29 +356,34 @@ func (s *Store) ListContacts(ctx context.Context, domain, actor, query, after st
}
return out, next, rows.Err()
}
func (s *Store) Contact(ctx context.Context, domain, actor, id string) (Contact, error) {
func (s *Store) Contact(ctx context.Context, domain, actor, id string) (result Contact, resultErr error) {
defer func() { resultErr = s.sqlError("contacts repository", resultErr) }()
var c Contact
if err := taskActor(ctx, s.DB, domain, actor, false); err != nil {
if err := s.taskActor(ctx, s.DB, domain, actor, false); err != nil {
return c, err
}
if err := contactEnabled(ctx, s.DB, domain); err != nil {
if err := s.contactEnabled(ctx, s.DB, domain); err != nil {
return c, err
}
var raw string
err := s.DB.QueryRowContext(ctx, `SELECT data FROM organizer_contacts WHERE domain_uuid=? AND owner_uuid=? AND uuid=?`, domain, actor, id).Scan(&raw)
err := s.DB.QueryRowContext(ctx, `SELECT data FROM organizer_contacts WHERE domain_uuid=`+s.sqlParam(1)+` AND owner_uuid=`+s.sqlParam(2)+` AND uuid=`+s.sqlParam(3), domain, actor, id).Scan(&raw)
if err == nil {
err = json.Unmarshal([]byte(raw), &c)
}
return c, err
}
func (s *Store) SaveContact(ctx context.Context, domain, actor string, c Contact, rawImport bool) (Contact, error) {
func (s *Store) SaveContact(ctx context.Context, domain, actor string, c Contact, rawImport bool) (result Contact, resultErr error) {
defer func() { resultErr = s.sqlError("contacts repository", resultErr) }()
mode := "fields"
if rawImport {
mode = "import"
}
return s.saveContact(ctx, domain, actor, c, mode, "", "")
}
func (s *Store) saveContact(ctx context.Context, domain, actor string, c Contact, mode, credential, name string) (Contact, error) {
func (s *Store) saveContact(ctx context.Context, domain, actor string, c Contact, mode, credential, name string) (result Contact, resultErr error) {
defer func() { resultErr = s.sqlError("contacts repository", resultErr) }()
ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
defer cancel()
if s.ReadOnly {
return c, ErrReadOnly
}
@@ -384,23 +395,26 @@ func (s *Store) saveContact(ctx context.Context, domain, actor string, c Contact
return c, err
}
defer tx.Rollback()
if _, err = tx.ExecContext(ctx, `UPDATE domain_memberships SET state=state WHERE domain_uuid=? AND principal_uuid=?`, domain, actor); err != nil {
if err = s.lockTaskWriter(ctx, tx); err != nil {
return c, err
}
if err = taskActor(ctx, tx, domain, actor, true); err != nil {
if _, err = tx.ExecContext(ctx, `UPDATE domain_memberships SET state=state WHERE domain_uuid=`+s.sqlParam(1)+` AND principal_uuid=`+s.sqlParam(2), domain, actor); err != nil {
return c, err
}
if err = contactEnabled(ctx, tx, domain); err != nil {
if err = s.taskActor(ctx, tx, domain, actor, true); err != nil {
return c, err
}
if err = s.contactEnabled(ctx, tx, domain); err != nil {
return c, err
}
if credential != "" {
if err = davCredentialAllowed(ctx, tx, domain, actor, credential, true, "contacts"); err != nil {
if err = s.davCredentialAllowed(ctx, tx, domain, actor, credential, true, "contacts"); err != nil {
return c, err
}
}
var old Contact
var data string
err = tx.QueryRowContext(ctx, `SELECT data FROM organizer_contacts WHERE domain_uuid=? AND owner_uuid=? AND uuid=?`, domain, actor, c.UUID).Scan(&data)
err = tx.QueryRowContext(ctx, `SELECT data FROM organizer_contacts WHERE domain_uuid=`+s.sqlParam(1)+` AND owner_uuid=`+s.sqlParam(2)+` AND uuid=`+s.sqlParam(3), domain, actor, c.UUID).Scan(&data)
if err == nil {
if err = json.Unmarshal([]byte(data), &old); err != nil {
return c, err
@@ -426,7 +440,7 @@ func (s *Store) saveContact(ctx context.Context, domain, actor string, c Contact
return c, ErrContactUIDConflict
}
var existing string
err = tx.QueryRowContext(ctx, `SELECT data FROM organizer_contacts WHERE domain_uuid=? AND owner_uuid=? AND uid=?`, domain, actor, c.UID).Scan(&existing)
err = tx.QueryRowContext(ctx, `SELECT data FROM organizer_contacts WHERE domain_uuid=`+s.sqlParam(1)+` AND owner_uuid=`+s.sqlParam(2)+` AND uid=`+s.sqlParam(3), domain, actor, c.UID).Scan(&existing)
if err == nil {
var previous Contact
if json.Unmarshal([]byte(existing), &previous) != nil {
@@ -456,18 +470,18 @@ func (s *Store) saveContact(ctx context.Context, domain, actor string, c Contact
return c, ErrTaskInvalid
}
var existing string
err = tx.QueryRowContext(ctx, `SELECT name FROM organizer_contact_names WHERE domain_uuid=? AND owner_uuid=? AND uuid=?`, domain, actor, c.UUID).Scan(&existing)
err = tx.QueryRowContext(ctx, `SELECT name FROM organizer_contact_names WHERE domain_uuid=`+s.sqlParam(1)+` AND owner_uuid=`+s.sqlParam(2)+` AND uuid=`+s.sqlParam(3), domain, actor, c.UUID).Scan(&existing)
if err == nil && existing != name {
return c, ErrTaskConflict
}
if err != nil && !errors.Is(err, sql.ErrNoRows) {
return c, err
}
if _, err = tx.ExecContext(ctx, `INSERT OR IGNORE INTO organizer_contact_names VALUES(?,?,?,?)`, domain, actor, c.UUID, name); err != nil {
if _, err = tx.ExecContext(ctx, `INSERT INTO organizer_contact_names(domain_uuid,owner_uuid,uuid,name) VALUES(`+s.sqlParam(1)+`,`+s.sqlParam(2)+`,`+s.sqlParam(3)+`,`+s.sqlParam(4)+`) ON CONFLICT DO NOTHING`, domain, actor, c.UUID, name); err != nil {
return c, err
}
var mapped string
if err = tx.QueryRowContext(ctx, `SELECT uuid FROM organizer_contact_names WHERE domain_uuid=? AND owner_uuid=? AND name=?`, domain, actor, name).Scan(&mapped); err != nil {
if err = tx.QueryRowContext(ctx, `SELECT uuid FROM organizer_contact_names WHERE domain_uuid=`+s.sqlParam(1)+` AND owner_uuid=`+s.sqlParam(2)+` AND name=`+s.sqlParam(3), domain, actor, name).Scan(&mapped); err != nil {
return c, err
}
if mapped != c.UUID {
@@ -481,15 +495,26 @@ func (s *Store) saveContact(ctx context.Context, domain, actor string, c Contact
}
hash := sha256.Sum256([]byte(c.VCard))
digest := hex.EncodeToString(hash[:])
if err = s.persistDocument(digest, c.VCard); err != nil {
if s.sqlBackend == storePostgreSQL {
if s.DocumentRoot == "" {
return c, ErrDocumentStoreRequired
}
docs, e := s.documentStorage()
if e != nil {
return c, e
}
if e = docs.PutIfAbsent(ctx, digest, int64(len(c.VCard)), strings.NewReader(c.VCard)); e != nil {
return c, e
}
} else if err = s.persistDocument(digest, c.VCard); err != nil {
return c, err
}
search := strings.ToLower(c.Name + "\n" + c.Organization + "\n" + strings.Join(c.Emails, "\n") + "\n" + strings.Join(c.Phones, "\n"))
_, err = tx.ExecContext(ctx, `INSERT INTO organizer_contacts(domain_uuid,owner_uuid,uuid,uid,version,name,search,data,hash,deleted) VALUES(?,?,?,?,?,?,?,?,?,?) ON CONFLICT(domain_uuid,owner_uuid,uuid) DO UPDATE SET version=excluded.version,name=excluded.name,search=excluded.search,data=excluded.data,hash=excluded.hash,deleted=excluded.deleted`, domain, actor, c.UUID, c.UID, c.Version, c.Name, search, string(b), digest, c.Deleted)
_, err = tx.ExecContext(ctx, `INSERT INTO organizer_contacts(domain_uuid,owner_uuid,uuid,uid,version,name,search,data,hash,deleted) VALUES(`+s.sqlParam(1)+`,`+s.sqlParam(2)+`,`+s.sqlParam(3)+`,`+s.sqlParam(4)+`,`+s.sqlParam(5)+`,`+s.sqlParam(6)+`,`+s.sqlParam(7)+`,`+s.sqlParam(8)+`,`+s.sqlParam(9)+`,`+s.sqlParam(10)+`) ON CONFLICT(domain_uuid,owner_uuid,uuid) DO UPDATE SET version=excluded.version,name=excluded.name,search=excluded.search,data=excluded.data,hash=excluded.hash,deleted=excluded.deleted`, domain, actor, c.UUID, c.UID, c.Version, c.Name, search, string(b), digest, boolToInt(c.Deleted))
if err != nil {
return c, fmt.Errorf("save contact: %w", err)
}
_, err = tx.ExecContext(ctx, `INSERT INTO organizer_contact_revisions VALUES(?,?,?,?,?,?,?)`, domain, actor, c.UUID, c.Version, digest, c.Deleted, time.Now().UnixMilli())
_, err = tx.ExecContext(ctx, `INSERT INTO organizer_contact_revisions(domain_uuid,owner_uuid,uuid,version,hash,deleted,created_ms) VALUES(`+s.sqlValues(7)+`)`, domain, actor, c.UUID, c.Version, digest, boolToInt(c.Deleted), time.Now().UnixMilli())
if err != nil {
return c, err
}