cristiancmoises
/
gophish
mirror of https://github.com/gophish/gophish
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug in POSTing campaign 

Removed gorp initialization code from models.go
pull/24/head
Jordan 2014-03-26 14:50:16 -05:00
parent 6e5361b210
commit 5740ee3273
3 changed files with 22 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
controllers/api.go
View File

@ -80,6 +80,7 @@ func API_Campaigns(w http.ResponseWriter, r *http.Request) {
c.CreatedDate = time.Now()
c.CompletedDate = time.Time{}
c.Status = IN_PROGRESS
c.UserId = ctx.Get(r, "user_id").(int64)
err = models.PostCampaign(&c, ctx.Get(r, "user_id").(int64))
if checkError(err, w, "Cannot insert campaign into database", http.StatusInternalServerError) {
return

2
models/campaign.go
View File

@ -74,7 +74,7 @@ func PostCampaign(c *Campaign, uid int64) error {
}
// Insert into the DB
/*err = Conn.Insert(c)*/
err = db.Debug().Save(&c).Error
err = db.Debug().Save(c).Error
if err != nil {
Logger.Println(err)
return err

109
models/models.go
View File

@ -3,10 +3,8 @@ package models
import (
"database/sql"
"errors"
"fmt"
"log"
"os"
"time"
"github.com/coopernurse/gorp"
"github.com/jinzhu/gorm"
@ -21,55 +19,33 @@ var err error
var ErrUsernameTaken = errors.New("username already taken")
var Logger = log.New(os.Stdout, " ", log.Ldate|log.Ltime|log.Lshortfile)
// Flash is used to hold flash information for use in templates.
type Flash struct {
Type string
Message string
}
// Setup initializes the Conn object
// It also populates the Gophish Config object
func Setup() error {
DB, err := sql.Open("sqlite3", config.Conf.DBPath)
if err != nil {
fmt.Printf("%v", err)
}
db, err = gorm.Open("sqlite3", "gophish_gorm.db")
db, err = gorm.Open("sqlite3", config.Conf.DBPath)
db.SetLogger(Logger)
db.CreateTable(User{})
db.CreateTable(Target{})
db.CreateTable(Result{})
db.CreateTable(Group{})
db.CreateTable(GroupTarget{})
db.CreateTable(UserGroup{})
db.CreateTable(Template{})
db.CreateTable(Campaign{})
Conn = &gorp.DbMap{Db: DB, Dialect: gorp.SqliteDialect{}}
if err != nil {
Logger.Println(err)
return err
}
//If the file already exists, delete it and recreate it
_, err = os.Stat(config.Conf.DBPath)
Conn.AddTableWithName(User{}, "users").SetKeys(true, "Id")
Conn.AddTableWithName(Campaign{}, "campaigns").SetKeys(true, "Id")
Conn.AddTableWithName(Group{}, "groups").SetKeys(true, "Id")
Conn.AddTableWithName(Template{}, "templates").SetKeys(true, "Id")
if err != nil {
Logger.Println("Database not found, recreating...")
createTablesSQL := []string{
//Create tables
`CREATE TABLE users (id INTEGER PRIMARY KEY AUTOINCREMENT, username TEXT NOT NULL, hash VARCHAR(60) NOT NULL, api_key VARCHAR(32), UNIQUE(username), UNIQUE(api_key));`,
`CREATE TABLE campaigns (id INTEGER PRIMARY KEY AUTOINCREMENT, name TEXT NOT NULL, created_date TIMESTAMP NOT NULL, completed_date TIMESTAMP, template TEXT, status TEXT NOT NULL);`,
`CREATE TABLE targets (id INTEGER PRIMARY KEY AUTOINCREMENT, email TEXT NOT NULL, UNIQUE(email));`,
`CREATE TABLE groups (id INTEGER PRIMARY KEY AUTOINCREMENT, name TEXT NOT NULL, modified_date TIMESTAMP NOT NULL);`,
`CREATE TABLE campaign_results (cid INTEGER NOT NULL, email TEXT NOT NULL, status TEXT NOT NULL, FOREIGN KEY (cid) REFERENCES campaigns(id), UNIQUE(cid, email, status))`,
`CREATE TABLE templates (id INTEGER PRIMARY KEY AUTOINCREMENT, name TEXT NOT NULL, modified_date TIMESTAMP NOT NULL, html TEXT NOT NULL, text TEXT NOT NULL);`,
`CREATE TABLE files (id INTEGER PRIMARY KEY AUTOINCREMENT, name TEXT NOT NULL, path TEXT NOT NULL);`,
`CREATE TABLE user_campaigns (uid INTEGER NOT NULL, cid INTEGER NOT NULL, FOREIGN KEY (uid) REFERENCES users(id), FOREIGN KEY (cid) REFERENCES campaigns(id), UNIQUE(uid, cid))`,
`CREATE TABLE user_groups (uid INTEGER NOT NULL, gid INTEGER NOT NULL, FOREIGN KEY (uid) REFERENCES users(id), FOREIGN KEY (gid) REFERENCES groups(id), UNIQUE(uid, gid))`,
`CREATE TABLE group_targets (gid INTEGER NOT NULL, tid INTEGER NOT NULL, FOREIGN KEY (gid) REFERENCES groups(id), FOREIGN KEY (tid) REFERENCES targets(id), UNIQUE(gid, tid));`,
`CREATE TABLE user_templates (uid INTEGER NOT NULL, tid INTEGER NOT NULL, FOREIGN KEY (uid) REFERENCES users(id), FOREIGN KEY (tid) REFERENCES templates(id), UNIQUE(uid, tid));`,
`CREATE TABLE template_files (tid INTEGER NOT NULL, fid INTEGER NOT NULL, FOREIGN KEY (tid) REFERENCES templates(id), FOREIGN KEY(fid) REFERENCES files(id), UNIQUE(tid, fid));`,
}
Logger.Printf("Creating db at %s\n", config.Conf.DBPath)
//Create the tables needed
for _, stmt := range createTablesSQL {
_, err = DB.Exec(stmt)
if err != nil {
return err
}
}
Logger.Printf("Database not found... creating db at %s\n", config.Conf.DBPath)
db.CreateTable(User{})
db.CreateTable(Target{})
db.CreateTable(Result{})
db.CreateTable(Group{})
db.CreateTable(GroupTarget{})
db.CreateTable(UserGroup{})
db.CreateTable(Template{})
db.CreateTable(Campaign{})
//Create the default user
init_user := User{
Username: "admin",
@ -80,51 +56,6 @@ func Setup() error {
if err != nil {
Logger.Println(err)
}
init_campaign := Campaign{
UserId: 1,
Name: "First Campaign",
CreatedDate: time.Now(), //gophish
CompletedDate: time.Now(),
Template: "",
Status: "In Progress",
Results: []Result{},
Groups: []Group{},
}
err = db.Debug().Save(&init_campaign).Error
if err != nil {
Logger.Println(err)
}
init_result := Result{
CampaignId: 1,
Email: "test@example.com",
Status: "Unsuccessful",
}
err = db.Debug().Save(&init_result).Error
if err != nil {
Logger.Println(err)
}
init_group := Group{
Name: "New Group",
ModifiedDate: time.Now(),
Targets: []Target{Target{
Email: "test@example.com"},
},
}
err = PostGroup(&init_group, 1)
if err != nil {
Logger.Println(err)
}
init_group.Targets = []Target{Target{Email: "test2@example.com"}}
err = PutGroup(&init_group, 1)
if err != nil {
Logger.Println(err)
}
}
return nil
}
// Flash is used to hold flash information for use in templates.
type Flash struct {
Type string
Message string
}