Browse Source

Security against deletion of dbPmRoomMap entries

master
Alex 5 months ago
parent
commit
7130c7b7d6
2 changed files with 8 additions and 4 deletions
  1. +3
    -3
      Dockerfile
  2. +5
    -1
      db.go

+ 3
- 3
Dockerfile View File

@ -1,7 +1,7 @@
#FROM archlinux:latest
#RUN pacman -Sy python-pip --noconfirm; pacman -Scc --noconfirm
FROM archlinux:latest
RUN pacman -Sy python-pip --noconfirm; pacman -Scc --noconfirm; find /var/cache/pacman/ -type f -delete; find /var/lib/pacman/sync/ -type f -delete
FROM python:3.8-buster
#FROM python:3.8.6-buster
RUN pip install fbchat

+ 5
- 1
db.go View File

@ -255,7 +255,11 @@ func dbGetMxPmRoom(protocol string, them connector.UserID, themMxId string, usMx
}
func dbDeletePmRoom(room *DbPmRoomMap) {
db.Delete(room)
if room.ID != 0 {
db.Delete(room)
} else {
log.Warnf("In dbDeletePmRoom: %#v (not deleting since primary key is zero)", room)
}
}
func dbGetMxUser(protocol string, userId connector.UserID) (string, error) {

Loading…
Cancel
Save