storage start and identity in shared config

This commit is contained in:
ycc
2023-01-07 00:39:05 +01:00
parent 52ae52ca9f
commit 5ac92ce3a8
7 changed files with 112 additions and 11 deletions

View File

@ -30,8 +30,10 @@ type Config struct {
GroupChatNotifiactions bool `json:"group_chat_notifiactions,omitempty"`
ChannelNotifications bool `json:"channel_notifications,omitempty"`
// Inner
memoryPassword string
identityFile string
memoryPassword string
additionalPasswords []string
identityFile string
me *Identity
}
var instance *Config
@ -75,3 +77,11 @@ func (c *Config) SetMemPass(pass string) {
func (c *Config) GetMemPass() string {
return c.memoryPassword
}
func (c *Config) SaveIdentity() error {
return c.me.Save()
}
func (c *Config) Clean() {
c.additionalPasswords = []string{}
}

View File

@ -32,6 +32,7 @@ func CreateIdentity(nickname string) *Identity {
var id Identity
id.Nickname = nickname
id.RootKp = meowlib.NewKeyPair()
GetConfig().me = &id
return &id
}
@ -124,6 +125,7 @@ func LoadIdentity(filename string, password string) (*Identity, error) {
return nil, err
}
err = json.Unmarshal([]byte(pass), &id)
GetConfig().me = &id
return &id, err
}

View File

@ -24,6 +24,8 @@ func TestLoad(t *testing.T) {
if err != nil {
id := CreateIdentity("myname")
id.Save()
} else {
log.Println(id.Nickname)
}
id, err = LoadIdentity("test.id", "toto")
if err != nil {

View File

@ -31,7 +31,7 @@ type Peer struct {
OnionMode bool `json:"onion_mode,omitempty"`
LastMessage time.Time `json:"last_message,omitempty"`
DbIds []string `json:"db_ids,omitempty"`
DbPassword string `json:"db_password,omitempty"`
dbPassword string
}
type PeerList []Peer
@ -193,9 +193,9 @@ func (p *Peer) UnPackUserMessage(protoPackedMessage []byte) (payload []byte, sig
return msg.Payload, msg.Signature, nil
}
func (p *Peer) GetConversationRequest() meowlib.ToServerMessage_ConversationRequest {
func (p *Peer) GetConversationRequest() *meowlib.ToServerMessage_ConversationRequest {
var cr meowlib.ToServerMessage_ConversationRequest
return cr
return &cr
}
func (p *Peer) ProcessOutboundUserMessage(usermessage *meowlib.UserMessage) (*meowlib.PackedUserMessage, error) {
@ -226,6 +226,14 @@ func (p *Peer) ProcessInboundUserMessage(message []byte, signature []byte) (*meo
return msg, nil
}
func (p *Peer) SetDbPassword(password string) {
p.dbPassword = password
}
func (p *Peer) GetDbPassword() string {
return p.dbPassword
}
func (p *Peer) StoreMessage(msg []byte) {
}

82
client/storage.go Normal file
View File

@ -0,0 +1,82 @@
package client
import (
"database/sql"
"os"
"path/filepath"
"forge.redroom.link/yves/meowlib"
"github.com/google/uuid"
_ "github.com/mattn/go-sqlite3"
)
func StoreMessage(peer *Peer, usermessage *meowlib.UserMessage, password string) error {
var dbid string
// If no db/no ID create DB + Tablz
if len(peer.DbIds) == 0 {
dbid = uuid.NewString()
file, err := os.Create(filepath.Join(GetConfig().StoragePath, dbid))
if err != nil {
return err
}
file.Close()
peer.DbIds = append(peer.DbIds, dbid)
sqliteDatabase, _ := sql.Open("sqlite3", filepath.Join(GetConfig().StoragePath, dbid)) // Open the created SQLite File
err = createTable(sqliteDatabase)
if err != nil {
return err
}
sqliteDatabase.Close()
GetConfig().me.Save()
} else {
dbid = peer.DbIds[len(peer.DbIds)-1]
}
// Open Db
db, _ := sql.Open("sqlite3", filepath.Join(GetConfig().StoragePath, dbid)) // Open the created SQLite File
defer db.Close()
// TODO Detach Files
if len(usermessage.Files) > 0 {
for _, f := range usermessage.Files {
hiddenFilename := uuid.NewString()
// TODO cypher file
encData, err := meowlib.SymEncrypt(password, f.Data)
if err != nil {
return err
}
os.WriteFile(hiddenFilename, encData, 0600)
// replace f.Data by uuid filename
f.Data = []byte(hiddenFilename)
}
}
// TODO Encrypt message
// Inser message
insertMessageSQL := `INSERT INTO message(m) VALUES (?)`
statement, err := db.Prepare(insertMessageSQL) // Prepare statement.
if err != nil {
return err
}
_, err = statement.Exec(usermessage)
if err != nil {
return err
}
return nil
}
// Get last messages from a peer
func GetLastMessages(peer *Peer, lastIdx int, count int, gotUuid string) {
// TODO Try to get count from last DB
// TODO Get missing from previous DB
}
func createTable(db *sql.DB) error {
createMessageTableSQL := `CREATE TABLE message (
"id" integer NOT NULL PRIMARY KEY AUTOINCREMENT,
"m" BLOB,
);` // SQL Statement for Create Table
statement, err := db.Prepare(createMessageTableSQL) // Prepare SQL Statement
if err != nil {
return err
}
statement.Exec() // Execute SQL Statements
return nil
}