mirror of
https://github.com/Luzifer/cloudkeys-go.git
synced 2024-11-14 00:42:44 +00:00
Knut Ahlers
a1df72edc5
commitf0db1ff1f8
Author: 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> commit9891df2a16
Author: Knut Ahlers <knut@ahlers.me> Date: Sun Dec 24 12:11:56 2017 +0100 Fix: Typo Signed-off-by: Knut Ahlers <knut@ahlers.me> commit836006de64
Author: 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> commitd64fee60c8
Author: 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
91 lines
2.5 KiB
Go
91 lines
2.5 KiB
Go
// Copyright 2013 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 (
|
|
"bytes"
|
|
"image"
|
|
"image/jpeg"
|
|
"io"
|
|
"io/ioutil"
|
|
)
|
|
|
|
const UserAttrImageSubpacket = 1
|
|
|
|
// UserAttribute is capable of storing other types of data about a user
|
|
// beyond name, email and a text comment. In practice, user attributes are typically used
|
|
// to store a signed thumbnail photo JPEG image of the user.
|
|
// See RFC 4880, section 5.12.
|
|
type UserAttribute struct {
|
|
Contents []*OpaqueSubpacket
|
|
}
|
|
|
|
// NewUserAttributePhoto creates a user attribute packet
|
|
// containing the given images.
|
|
func NewUserAttributePhoto(photos ...image.Image) (uat *UserAttribute, err error) {
|
|
uat = new(UserAttribute)
|
|
for _, photo := range photos {
|
|
var buf bytes.Buffer
|
|
// RFC 4880, Section 5.12.1.
|
|
data := []byte{
|
|
0x10, 0x00, // Little-endian image header length (16 bytes)
|
|
0x01, // Image header version 1
|
|
0x01, // JPEG
|
|
0, 0, 0, 0, // 12 reserved octets, must be all zero.
|
|
0, 0, 0, 0,
|
|
0, 0, 0, 0}
|
|
if _, err = buf.Write(data); err != nil {
|
|
return
|
|
}
|
|
if err = jpeg.Encode(&buf, photo, nil); err != nil {
|
|
return
|
|
}
|
|
uat.Contents = append(uat.Contents, &OpaqueSubpacket{
|
|
SubType: UserAttrImageSubpacket,
|
|
Contents: buf.Bytes()})
|
|
}
|
|
return
|
|
}
|
|
|
|
// NewUserAttribute creates a new user attribute packet containing the given subpackets.
|
|
func NewUserAttribute(contents ...*OpaqueSubpacket) *UserAttribute {
|
|
return &UserAttribute{Contents: contents}
|
|
}
|
|
|
|
func (uat *UserAttribute) parse(r io.Reader) (err error) {
|
|
// RFC 4880, section 5.13
|
|
b, err := ioutil.ReadAll(r)
|
|
if err != nil {
|
|
return
|
|
}
|
|
uat.Contents, err = OpaqueSubpackets(b)
|
|
return
|
|
}
|
|
|
|
// Serialize marshals the user attribute to w in the form of an OpenPGP packet, including
|
|
// header.
|
|
func (uat *UserAttribute) Serialize(w io.Writer) (err error) {
|
|
var buf bytes.Buffer
|
|
for _, sp := range uat.Contents {
|
|
sp.Serialize(&buf)
|
|
}
|
|
if err = serializeHeader(w, packetTypeUserAttribute, buf.Len()); err != nil {
|
|
return err
|
|
}
|
|
_, err = w.Write(buf.Bytes())
|
|
return
|
|
}
|
|
|
|
// ImageData returns zero or more byte slices, each containing
|
|
// JPEG File Interchange Format (JFIF), for each photo in the
|
|
// the user attribute packet.
|
|
func (uat *UserAttribute) ImageData() (imageData [][]byte) {
|
|
for _, sp := range uat.Contents {
|
|
if sp.SubType == UserAttrImageSubpacket && len(sp.Contents) > 16 {
|
|
imageData = append(imageData, sp.Contents[16:])
|
|
}
|
|
}
|
|
return
|
|
}
|