added ability to add content

account.go

@@ -3,8 +3,8 @@ package main
import (
	"encoding/json"
	"errors"
	"fmt"
	"io/ioutil"
	"log"
	"os"
	"path/filepath"
	"strings"
@@ -151,7 +151,6 @@ func (a *Account) Delete() error {
	if err != nil {
		return err
	}
	log.Printf(string(marshalled))
	// Write to the file
	fi, err := os.OpenFile(UserFile, os.O_TRUNC|os.O_WRONLY, 0666)
@@ -177,10 +176,55 @@ func (a *Account) Delete() error {
}
func (a *Account) Add(content, filename string, file []byte) (string, error) {
	// TODO: Create new content directory
	// TODO: Check if filename already exists
	// TODO: Write file to content directory
	return "", nil
	if filename == "" {
		return "", errors.New("Missing filename")
	}
	valid, err := a.Validate()
	if err != nil {
		return "", err
	}
	if !valid {
		return "", errors.New("Account does not exist")
	}
	// Get basic information needed
	baseDir := os.Getenv("LOOP_DATA")
	userDir := strings.ToLower(a.Username)
	s := string(filepath.Separator)
	// Create new content directory if necessary
	if content == "" {
		content = fmt.Sprintf("%x", hash(userDir+time.Now().Format(publishLayout), salt()))
	}
	// Create new content directory
	contentPath := baseDir + s + userDir + s + "content" + s + content
	if _, err := os.Stat(contentPath); os.IsNotExist(err) {
		err = os.MkdirAll(contentPath, 0755)
		if err != nil {
			return "", err
		}
	}
	// Check if filename already exists
	filePath := contentPath + s + filename
	if _, err := os.Stat(filePath); os.IsExist(err) {
		return filePath, err
	}
	// Write file to content directory
	fi, err := os.OpenFile(filePath, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0666)
	if err != nil {
		return filePath, err
	}
	_, err = fi.Write(file)
	if err != nil {
		return filePath, err
	}
	fi.Close()
	return filePath, nil
}
func (a *Account) Publish(title, content string, date time.Time) error {

account_test.go

@@ -50,6 +50,24 @@ func TestValidate(t *testing.T) {
}
func TestAdd(t *testing.T) {
	a := Account{
		Username:   "guest",
		Passphrase: "guest",
	}
	ConfigureEnvironment()
	fp, err := a.Add("", "", []byte{})
	if err == nil {
		t.Error("Fake content should not be publishable")
	}
	fp, err = a.Add("", "README.md", []byte{})
	if fp == "" {
		t.Error("File name should have been returned")
	}
	if err != nil {
		t.Error(err)
	}
}
func TestPublish(t *testing.T) {

main.go

@@ -3,6 +3,7 @@ package main
import (
	"crypto/aes"
	"crypto/cipher"
	"crypto/md5"
	"crypto/rand"
	"crypto/sha512"
	"encoding/base64"
@@ -119,7 +120,12 @@ func decrypt(text []byte, passphrase string) ([]byte, error) {
	decrypter.XORKeyStream(data, data)
	return data, nil
}
func hash(username, passphrase, salt string) []byte {
func hash(clearText, salt string) []byte {
	h := md5.New()
	h.Write([]byte(clearText))
	return h.Sum(nil)
}
func hashCredentials(username, passphrase, salt string) []byte {
	clearText := fmt.Sprintf(
		"%s%s-%s",
		salt,
@@ -131,5 +137,5 @@ func hash(username, passphrase, salt string) []byte {
	return sha.Sum(nil)
}
func generatePassphrase(username, passphrase string) string {
	return encodeBase64(hash(username, passphrase, salt()))
	return encodeBase64(hashCredentials(username, passphrase, salt()))
}