mirror of
https://github.com/Luzifer/cloudkeys-go.git
synced 2024-11-14 00:42:44 +00:00
Knut Ahlers
a1df72edc5
commitf0db1ff1f8Author: Knut Ahlers <knut@ahlers.me> Date: Sun Dec 24 12:19:56 2017 +0100 Mark option as deprecated Signed-off-by: Knut Ahlers <knut@ahlers.me> commit9891df2a16Author: Knut Ahlers <knut@ahlers.me> Date: Sun Dec 24 12:11:56 2017 +0100 Fix: Typo Signed-off-by: Knut Ahlers <knut@ahlers.me> commit836006de64Author: Knut Ahlers <knut@ahlers.me> Date: Sun Dec 24 12:04:20 2017 +0100 Add new dependencies Signed-off-by: Knut Ahlers <knut@ahlers.me> commitd64fee60c8Author: Knut Ahlers <knut@ahlers.me> Date: Sun Dec 24 11:55:52 2017 +0100 Replace insecure password hashing Prior this commit passwords were hashed with a static salt and using the SHA1 hashing function. This could lead to passwords being attackable in case someone gets access to the raw data stored inside the database. This commit introduces password hashing using bcrypt hashing function which addresses this issue. Old passwords are not automatically re-hashed as they are unknown. Replacing the old password scheme is not that easy and needs #10 to be solved. Therefore the old hashing scheme is kept for compatibility reason. Signed-off-by: Knut Ahlers <knut@ahlers.me> Signed-off-by: Knut Ahlers <knut@ahlers.me> closes #14 closes #15
89 lines
1.9 KiB
Go
89 lines
1.9 KiB
Go
// Copyright 2011 The Go Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package packet
|
|
|
|
import (
|
|
"encoding/binary"
|
|
"io"
|
|
)
|
|
|
|
// LiteralData represents an encrypted file. See RFC 4880, section 5.9.
|
|
type LiteralData struct {
|
|
IsBinary bool
|
|
FileName string
|
|
Time uint32 // Unix epoch time. Either creation time or modification time. 0 means undefined.
|
|
Body io.Reader
|
|
}
|
|
|
|
// ForEyesOnly returns whether the contents of the LiteralData have been marked
|
|
// as especially sensitive.
|
|
func (l *LiteralData) ForEyesOnly() bool {
|
|
return l.FileName == "_CONSOLE"
|
|
}
|
|
|
|
func (l *LiteralData) parse(r io.Reader) (err error) {
|
|
var buf [256]byte
|
|
|
|
_, err = readFull(r, buf[:2])
|
|
if err != nil {
|
|
return
|
|
}
|
|
|
|
l.IsBinary = buf[0] == 'b'
|
|
fileNameLen := int(buf[1])
|
|
|
|
_, err = readFull(r, buf[:fileNameLen])
|
|
if err != nil {
|
|
return
|
|
}
|
|
|
|
l.FileName = string(buf[:fileNameLen])
|
|
|
|
_, err = readFull(r, buf[:4])
|
|
if err != nil {
|
|
return
|
|
}
|
|
|
|
l.Time = binary.BigEndian.Uint32(buf[:4])
|
|
l.Body = r
|
|
return
|
|
}
|
|
|
|
// SerializeLiteral serializes a literal data packet to w and returns a
|
|
// WriteCloser to which the data itself can be written and which MUST be closed
|
|
// on completion. The fileName is truncated to 255 bytes.
|
|
func SerializeLiteral(w io.WriteCloser, isBinary bool, fileName string, time uint32) (plaintext io.WriteCloser, err error) {
|
|
var buf [4]byte
|
|
buf[0] = 't'
|
|
if isBinary {
|
|
buf[0] = 'b'
|
|
}
|
|
if len(fileName) > 255 {
|
|
fileName = fileName[:255]
|
|
}
|
|
buf[1] = byte(len(fileName))
|
|
|
|
inner, err := serializeStreamHeader(w, packetTypeLiteralData)
|
|
if err != nil {
|
|
return
|
|
}
|
|
|
|
_, err = inner.Write(buf[:2])
|
|
if err != nil {
|
|
return
|
|
}
|
|
_, err = inner.Write([]byte(fileName))
|
|
if err != nil {
|
|
return
|
|
}
|
|
binary.BigEndian.PutUint32(buf[:], time)
|
|
_, err = inner.Write(buf[:])
|
|
if err != nil {
|
|
return
|
|
}
|
|
|
|
plaintext = inner
|
|
return
|
|
}
|