Browse Source

Update bcrypt dependency and code moved to gophish group

pull/64/head
William Woodson 5 years ago
parent
commit
3a0fa4f93f
13 changed files with 24 additions and 24 deletions
  1. +2
    -2
      README.md
  2. +2
    -2
      auth/auth.go
  3. +4
    -4
      controllers/api.go
  4. +2
    -2
      controllers/api_test.go
  5. +3
    -3
      controllers/route.go
  6. +3
    -3
      gophish.go
  7. +2
    -2
      middleware/middleware.go
  8. +1
    -1
      models/models.go
  9. +1
    -1
      models/models_test.go
  10. +1
    -1
      templates/docs.html
  11. +1
    -1
      templates/gophish.apib
  12. +1
    -1
      util/util.go
  13. +1
    -1
      worker/worker.go

+ 2
- 2
README.md View File

@ -1,4 +1,4 @@
![gophish logo](https://raw.github.com/jordan-wright/gophish/master/static/images/gophish_purple.png)
![gophish logo](https://raw.github.com/gophish/gophish/master/static/images/gophish_purple.png)
gophish
=======
@ -34,7 +34,7 @@ Documentation is a work in progress. Existing documentation can be found on our
###Issues
Find a bug? Want more features? Find something missing in the documentation? Let us know! Please don't hesitate to [file an issue](https://github.com/jordan-wright/gophish/issues/new) and we'll get right on it.
Find a bug? Want more features? Find something missing in the documentation? Let us know! Please don't hesitate to [file an issue](https://github.com/gophish/gophish/issues/new) and we'll get right on it.
###License
```

+ 2
- 2
auth/auth.go View File

@ -9,11 +9,11 @@ import (
"crypto/rand"
"code.google.com/p/go.crypto/bcrypt"
"golang.org/x/crypto/bcrypt"
ctx "github.com/gorilla/context"
"github.com/gorilla/securecookie"
"github.com/gorilla/sessions"
"github.com/jordan-wright/gophish/models"
"github.com/gophish/gophish/models"
)
//init registers the necessary models to be saved in the session later

+ 4
- 4
controllers/api.go View File

@ -14,10 +14,10 @@ import (
"github.com/gorilla/mux"
"github.com/jinzhu/gorm"
"github.com/jordan-wright/email"
"github.com/jordan-wright/gophish/auth"
"github.com/jordan-wright/gophish/models"
"github.com/jordan-wright/gophish/util"
"github.com/jordan-wright/gophish/worker"
"github.com/gophish/gophish/auth"
"github.com/gophish/gophish/models"
"github.com/gophish/gophish/util"
"github.com/gophish/gophish/worker"
)
// Worker is the worker that processes phishing events and updates campaigns.

+ 2
- 2
controllers/api_test.go View File

@ -10,8 +10,8 @@ import (
"testing"
"github.com/gorilla/handlers"
"github.com/jordan-wright/gophish/config"
"github.com/jordan-wright/gophish/models"
"github.com/gophish/gophish/config"
"github.com/gophish/gophish/models"
"github.com/stretchr/testify/suite"
)

+ 3
- 3
controllers/route.go View File

@ -11,9 +11,9 @@ import (
ctx "github.com/gorilla/context"
"github.com/gorilla/mux"
"github.com/gorilla/sessions"
"github.com/jordan-wright/gophish/auth"
mid "github.com/jordan-wright/gophish/middleware"
"github.com/jordan-wright/gophish/models"
"github.com/gophish/gophish/auth"
mid "github.com/gophish/gophish/middleware"
"github.com/gophish/gophish/models"
"github.com/justinas/nosurf"
)

+ 3
- 3
gophish.go View File

@ -32,9 +32,9 @@ import (
"os"
"github.com/gorilla/handlers"
"github.com/jordan-wright/gophish/config"
"github.com/jordan-wright/gophish/controllers"
"github.com/jordan-wright/gophish/models"
"github.com/gophish/gophish/config"
"github.com/gophish/gophish/controllers"
"github.com/gophish/gophish/models"
)
var Logger = log.New(os.Stdout, " ", log.Ldate|log.Ltime|log.Lshortfile)

+ 2
- 2
middleware/middleware.go View File

@ -6,8 +6,8 @@ import (
"net/http"
ctx "github.com/gorilla/context"
"github.com/jordan-wright/gophish/auth"
"github.com/jordan-wright/gophish/models"
"github.com/gophish/gophish/auth"
"github.com/gophish/gophish/models"
)
// GetContext wraps each request in a function which fills in the context for a given request.

+ 1
- 1
models/models.go View File

@ -6,7 +6,7 @@ import (
"os"
"github.com/jinzhu/gorm"
"github.com/jordan-wright/gophish/config"
"github.com/gophish/gophish/config"
_ "github.com/mattn/go-sqlite3" // Blank import needed to import sqlite3
)

+ 1
- 1
models/models_test.go View File

@ -3,7 +3,7 @@ package models
import (
"testing"
"github.com/jordan-wright/gophish/config"
"github.com/gophish/gophish/config"
"gopkg.in/check.v1"
)

+ 1
- 1
templates/docs.html
File diff suppressed because it is too large
View File


+ 1
- 1
templates/gophish.apib View File

@ -4,7 +4,7 @@ HOST: http://localhost:3333/api/
# Gophish API
Gophish was built from the ground-up with a JSON API that makes it easy for developers and sysadmins to automate simulated phishing campaigns.
These docs describe how to use the [gophish](https://github.com/jordan-wright/gophish) API.
These docs describe how to use the [gophish](https://github.com/gophish/gophish) API.
::: note
## Authorization

+ 1
- 1
util/util.go View File

@ -9,7 +9,7 @@ import (
"net/mail"
"github.com/jordan-wright/email"
"github.com/jordan-wright/gophish/models"
"github.com/gophish/gophish/models"
)
// ParseMail takes in an HTTP Request and returns an Email object

+ 1
- 1
worker/worker.go View File

@ -10,7 +10,7 @@ import (
"text/template"
"github.com/jordan-wright/email"
"github.com/jordan-wright/gophish/models"
"github.com/gophish/gophish/models"
)
// Logger is the logger for the worker

Loading…
Cancel
Save