|
|
@ -316,15 +316,20 @@ func oxPublishPubKey(jid string, client *xmpp.Client, iqc chan xmpp.IQ, pubKey *
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
func oxGetPrivKeyLoc(jid string) (string, error) {
|
|
|
|
func oxGetPrivKeyLoc(jid string) (string, error) {
|
|
|
|
dataDir, err := getDataPath("oxprivkeys/")
|
|
|
|
dataDir, err := getDataPath(strings.Replace(strings.Replace(jid, "@", "_at_", -1), ".", "_", -1))
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
|
|
|
|
return strError, fmt.Errorf("oxGetPubKeyLoc: %w", err)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
oldDataDir, err := getDataPath("oxprivkeys/")
|
|
|
|
if err != nil {
|
|
|
|
if err != nil {
|
|
|
|
return strError, fmt.Errorf("oxGetPubKeyLoc: %w", err)
|
|
|
|
return strError, fmt.Errorf("oxGetPubKeyLoc: %w", err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// TODO: Remove handling of oldDataFile in a later version when it's very likely that there are no
|
|
|
|
// TODO: Remove handling of oldDataFile in a later version when it's very likely that there are no
|
|
|
|
// more versions in use using the oldDataFile (<0.8.3).
|
|
|
|
// more versions in use using the oldDataFile (<0.8.3).
|
|
|
|
oldDataFile := dataDir + base64.StdEncoding.EncodeToString([]byte(jid))
|
|
|
|
oldDataFile := oldDataDir + base64.StdEncoding.EncodeToString([]byte(jid))
|
|
|
|
oldDataFile2 := dataDir + strings.Replace(jid, "@", "_at_", -1)
|
|
|
|
oldDataFile2 := oldDataDir + strings.Replace(jid, "@", "_at_", -1)
|
|
|
|
dataFile := dataDir + strings.Replace(strings.Replace(jid, "@", "_at_", -1), ".", "_", -1)
|
|
|
|
oldDataFile3 := oldDataDir + strings.Replace(strings.Replace(jid, "@", "_at_", -1), ".", "_", -1)
|
|
|
|
|
|
|
|
dataFile := dataDir + "oxprivkey"
|
|
|
|
if _, err := os.Stat(oldDataFile); err == nil {
|
|
|
|
if _, err := os.Stat(oldDataFile); err == nil {
|
|
|
|
err := os.Rename(oldDataFile, dataFile)
|
|
|
|
err := os.Rename(oldDataFile, dataFile)
|
|
|
|
if err != nil {
|
|
|
|
if err != nil {
|
|
|
@ -337,6 +342,12 @@ func oxGetPrivKeyLoc(jid string) (string, error) {
|
|
|
|
return dataFile, err
|
|
|
|
return dataFile, err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if _, err := os.Stat(oldDataFile3); err == nil {
|
|
|
|
|
|
|
|
err := os.Rename(oldDataFile3, dataFile)
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
|
|
|
|
return dataFile, err
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
return dataFile, nil
|
|
|
|
return dataFile, nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|