Skip to content

Commit

Permalink
Tn/change import paths (#891)
Browse files Browse the repository at this point in the history
* change import paths

* change author name

* update author name
  • Loading branch information
TylerNoblett committed Jul 19, 2023
1 parent bca06db commit d29ce9d
Show file tree
Hide file tree
Showing 139 changed files with 501 additions and 501 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/question.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ labels: "question"

---

Please ask your question below in plain language as described in our [Code of Conduct](https://github.com/theparanoids/ashirt-server/blob/master/Code-of-Conduct.md)
Please ask your question below in plain language as described in our [Code of Conduct](https://github.com/ashirt-ops/ashirt-server/blob/master/Code-of-Conduct.md)
6 changes: 3 additions & 3 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ are a few simple things to check before submitting your pull request
that can help with the review process. We only seek to accept code that you are authorized to contribute to the project. This pull request template is included on our projects so that your contributions are made with the following confirmation: I confirm that this contribution is made under the terms of the license found in the root directory of this repository's source tree and that I have the authority necessary to make this contribution on behalf of its copyright owner.
-->

- Please review our [contributing guidelines](https://github.com/theparanoids/ashirt-server/blob/master/Contributing.md)
- Please review our [Code of Conduct](https://github.com/theparanoids/ashirt-server/blob/master/Code-of-Conduct.md)
- Please review our [contributing guidelines](https://github.com/ashirt-ops/ashirt-server/blob/master/Contributing.md)
- Please review our [Code of Conduct](https://github.com/ashirt-ops/ashirt-server/blob/master/Code-of-Conduct.md)

I confirm that this contribution is made under the terms of the license found in the root directory of this repository's source tree and that I have the authority necessary to make this contribution on behalf of its copyright owner.
I confirm that this contribution is made under the terms of the license found in the root directory of this repository's source tree and that I have the authority necessary to make this contribution on behalf of its copyright owner.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# ASHIRT

Adversary Simulators High-Fidelity Intelligence and Reporting Toolkit. This repo contains only the server side and frontend code for ASHIRT. You can find the ASHIRT client [here](https://www.github.com/theparanoids/ashirt) and aterm [here](https://www.github.com/theparanoids/aterm).
Adversary Simulators High-Fidelity Intelligence and Reporting Toolkit. This repo contains only the server side and frontend code for ASHIRT. You can find the ASHIRT client [here](https://www.github.com/ashirt-ops/ashirt) and aterm [here](https://www.github.com/ashirt-ops/aterm).

## Table of Contents

Expand All @@ -18,7 +18,7 @@ Documenting and reporting is a key part of our jobs and generally the part we al
[![2020 presentation](https://img.youtube.com/vi/NNPsfTbDPG0/0.jpg)](https://youtu.be/NNPsfTbDPG0)

## Install
If you just want to try ashirt out locally, check out the [quickstart docs](https://github.com/theparanoids/ashirt-server/wiki/quickstart). If you're looking for a production-ready deployment reference, check out [ashirt-deployments](https://github.com/theparanoids/ashirt-deployments/tree/main/ecs).
If you just want to try ashirt out locally, check out the [quickstart docs](https://github.com/ashirt-ops/ashirt-server/wiki/quickstart). If you're looking for a production-ready deployment reference, check out [ashirt-deployments](https://github.com/ashirt-ops/ashirt-deployments/tree/main/ecs).

Detailed instructions for building and installation are available for the [frontend](frontend/Readme.md) and [backend](backend/Readme.md).

Expand Down
2 changes: 1 addition & 1 deletion backend/Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ While Webauthn provides a number of possible configurations, the minimum is actu

##### Webauthn as a second factor for local login

Currently, AShirt does not support Webauthn as a second factor for multi-factor local login. If you'd like to see this, please [leave an issue](https://github.com/theparanoids/ashirt-server/issues?q=is%3Aissue+is%3Aopen+webauthn) requesting this feature.
Currently, AShirt does not support Webauthn as a second factor for multi-factor local login. If you'd like to see this, please [leave an issue](https://github.com/ashirt-ops/ashirt-server/issues?q=is%3Aissue+is%3Aopen+webauthn) requesting this feature.

#### Custom Authentication

Expand Down
16 changes: 8 additions & 8 deletions backend/authschemes/auth_bridge.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ import (
"net/http"
"time"

"github.com/theparanoids/ashirt-server/backend"
"github.com/theparanoids/ashirt-server/backend/database"
"github.com/theparanoids/ashirt-server/backend/dtos"
"github.com/theparanoids/ashirt-server/backend/logging"
"github.com/theparanoids/ashirt-server/backend/models"
"github.com/theparanoids/ashirt-server/backend/server/middleware"
"github.com/theparanoids/ashirt-server/backend/services"
"github.com/theparanoids/ashirt-server/backend/session"
"github.com/ashirt-ops/ashirt-server/backend"
"github.com/ashirt-ops/ashirt-server/backend/database"
"github.com/ashirt-ops/ashirt-server/backend/dtos"
"github.com/ashirt-ops/ashirt-server/backend/logging"
"github.com/ashirt-ops/ashirt-server/backend/models"
"github.com/ashirt-ops/ashirt-server/backend/server/middleware"
"github.com/ashirt-ops/ashirt-server/backend/services"
"github.com/ashirt-ops/ashirt-server/backend/session"

sq "github.com/Masterminds/squirrel"
)
Expand Down
12 changes: 6 additions & 6 deletions backend/authschemes/auth_bridge_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ import (
"testing"
"time"

"github.com/theparanoids/ashirt-server/backend/authschemes"
"github.com/theparanoids/ashirt-server/backend/database"
"github.com/theparanoids/ashirt-server/backend/logging"
"github.com/theparanoids/ashirt-server/backend/models"
"github.com/theparanoids/ashirt-server/backend/session"
"github.com/theparanoids/ashirt-server/backend/workers"
"github.com/ashirt-ops/ashirt-server/backend/authschemes"
"github.com/ashirt-ops/ashirt-server/backend/database"
"github.com/ashirt-ops/ashirt-server/backend/logging"
"github.com/ashirt-ops/ashirt-server/backend/models"
"github.com/ashirt-ops/ashirt-server/backend/session"
"github.com/ashirt-ops/ashirt-server/backend/workers"

sq "github.com/Masterminds/squirrel"
"github.com/stretchr/testify/require"
Expand Down
4 changes: 2 additions & 2 deletions backend/authschemes/global_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
package authschemes

import (
"github.com/theparanoids/ashirt-server/backend"
"github.com/theparanoids/ashirt-server/backend/database"
"github.com/ashirt-ops/ashirt-server/backend"
"github.com/ashirt-ops/ashirt-server/backend/database"
)

// CreateNewAuthForUserGeneric provides a mechanism for non-auth providers to generate new authentications
Expand Down
2 changes: 1 addition & 1 deletion backend/authschemes/global_helpers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package authschemes_test
import (
"testing"

"github.com/ashirt-ops/ashirt-server/backend/authschemes"
"github.com/stretchr/testify/require"
"github.com/theparanoids/ashirt-server/backend/authschemes"
)

func TestCreateNewAuthForUserGeneric(t *testing.T) {
Expand Down
12 changes: 6 additions & 6 deletions backend/authschemes/localauth/local_auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ import (
"fmt"
"net/http"

"github.com/ashirt-ops/ashirt-server/backend"
"github.com/ashirt-ops/ashirt-server/backend/authschemes"
"github.com/ashirt-ops/ashirt-server/backend/authschemes/localauth/constants"
"github.com/ashirt-ops/ashirt-server/backend/dtos"
"github.com/ashirt-ops/ashirt-server/backend/server/middleware"
"github.com/ashirt-ops/ashirt-server/backend/server/remux"
"github.com/go-chi/chi/v5"
"github.com/theparanoids/ashirt-server/backend"
"github.com/theparanoids/ashirt-server/backend/authschemes"
"github.com/theparanoids/ashirt-server/backend/authschemes/localauth/constants"
"github.com/theparanoids/ashirt-server/backend/dtos"
"github.com/theparanoids/ashirt-server/backend/server/middleware"
"github.com/theparanoids/ashirt-server/backend/server/remux"
"golang.org/x/crypto/bcrypt"
)

Expand Down
10 changes: 5 additions & 5 deletions backend/authschemes/localauth/services.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import (
"errors"
"strings"

"github.com/theparanoids/ashirt-server/backend"
"github.com/theparanoids/ashirt-server/backend/authschemes"
"github.com/theparanoids/ashirt-server/backend/policy"
"github.com/theparanoids/ashirt-server/backend/server/middleware"
"github.com/ashirt-ops/ashirt-server/backend"
"github.com/ashirt-ops/ashirt-server/backend/authschemes"
"github.com/ashirt-ops/ashirt-server/backend/policy"
"github.com/ashirt-ops/ashirt-server/backend/server/middleware"
"golang.org/x/crypto/bcrypt"

"github.com/theparanoids/ashirt-server/backend/services"
"github.com/ashirt-ops/ashirt-server/backend/services"
)

type RegistrationInfo struct {
Expand Down
8 changes: 4 additions & 4 deletions backend/authschemes/localauth/services_internal_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"testing"
"time"

"github.com/ashirt-ops/ashirt-server/backend/authschemes"
"github.com/ashirt-ops/ashirt-server/backend/database/seeding"
"github.com/ashirt-ops/ashirt-server/backend/helpers"
"github.com/ashirt-ops/ashirt-server/backend/session"
"github.com/stretchr/testify/require"
"github.com/theparanoids/ashirt-server/backend/authschemes"
"github.com/theparanoids/ashirt-server/backend/database/seeding"
"github.com/theparanoids/ashirt-server/backend/helpers"
"github.com/theparanoids/ashirt-server/backend/session"
)

func initBridge(t *testing.T) authschemes.AShirtAuthBridge {
Expand Down
2 changes: 1 addition & 1 deletion backend/authschemes/localauth/session.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"encoding/gob"
"net/http"

"github.com/theparanoids/ashirt-server/backend/authschemes"
"github.com/ashirt-ops/ashirt-server/backend/authschemes"
)

// localAuthSession is saved as an authscheme session for users that have "some difficulty" in logging in --
Expand Down
2 changes: 1 addition & 1 deletion backend/authschemes/localauth/totp_key.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"image/png"
"time"

"github.com/ashirt-ops/ashirt-server/backend"
"github.com/pquerna/otp"
"github.com/pquerna/otp/totp"
"github.com/theparanoids/ashirt-server/backend"
)

// TOTPKey represents the secret and QR code for a given URL to authenticate with
Expand Down
10 changes: 5 additions & 5 deletions backend/authschemes/oidcauth/oidc_auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ import (
"fmt"
"net/http"

"github.com/ashirt-ops/ashirt-server/backend"
"github.com/ashirt-ops/ashirt-server/backend/authschemes"
"github.com/ashirt-ops/ashirt-server/backend/config"
"github.com/ashirt-ops/ashirt-server/backend/server/middleware"
"github.com/ashirt-ops/ashirt-server/backend/server/remux"
"github.com/coreos/go-oidc/v3/oidc"
"github.com/go-chi/chi/v5"
"github.com/gorilla/csrf"
"github.com/theparanoids/ashirt-server/backend"
"github.com/theparanoids/ashirt-server/backend/authschemes"
"github.com/theparanoids/ashirt-server/backend/config"
"github.com/theparanoids/ashirt-server/backend/server/middleware"
"github.com/theparanoids/ashirt-server/backend/server/remux"
"golang.org/x/oauth2"
)

Expand Down
8 changes: 4 additions & 4 deletions backend/authschemes/recoveryauth/helpers/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"crypto/rand"
"encoding/hex"

"github.com/theparanoids/ashirt-server/backend"
"github.com/theparanoids/ashirt-server/backend/authschemes"
recoveryConsts "github.com/theparanoids/ashirt-server/backend/authschemes/recoveryauth/constants"
"github.com/theparanoids/ashirt-server/backend/database"
"github.com/ashirt-ops/ashirt-server/backend"
"github.com/ashirt-ops/ashirt-server/backend/authschemes"
recoveryConsts "github.com/ashirt-ops/ashirt-server/backend/authschemes/recoveryauth/constants"
"github.com/ashirt-ops/ashirt-server/backend/database"
)

const recoveryKeyLength = 40
Expand Down
12 changes: 6 additions & 6 deletions backend/authschemes/recoveryauth/helpers/helpers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ import (
"testing"

sq "github.com/Masterminds/squirrel"
recoveryConsts "github.com/ashirt-ops/ashirt-server/backend/authschemes/recoveryauth/constants"
recoveryHelpers "github.com/ashirt-ops/ashirt-server/backend/authschemes/recoveryauth/helpers"
"github.com/ashirt-ops/ashirt-server/backend/database"
"github.com/ashirt-ops/ashirt-server/backend/database/seeding"
"github.com/ashirt-ops/ashirt-server/backend/helpers"
"github.com/ashirt-ops/ashirt-server/backend/models"
"github.com/stretchr/testify/require"
recoveryConsts "github.com/theparanoids/ashirt-server/backend/authschemes/recoveryauth/constants"
recoveryHelpers "github.com/theparanoids/ashirt-server/backend/authschemes/recoveryauth/helpers"
"github.com/theparanoids/ashirt-server/backend/database"
"github.com/theparanoids/ashirt-server/backend/database/seeding"
"github.com/theparanoids/ashirt-server/backend/helpers"
"github.com/theparanoids/ashirt-server/backend/models"
)

func TestGenerateRecoveryCodeForUser(t *testing.T) {
Expand Down
12 changes: 6 additions & 6 deletions backend/authschemes/recoveryauth/recovery_auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ import (
"strings"
"time"

"github.com/ashirt-ops/ashirt-server/backend"
"github.com/ashirt-ops/ashirt-server/backend/authschemes"
"github.com/ashirt-ops/ashirt-server/backend/authschemes/recoveryauth/constants"
"github.com/ashirt-ops/ashirt-server/backend/logging"
"github.com/ashirt-ops/ashirt-server/backend/server/middleware"
"github.com/ashirt-ops/ashirt-server/backend/server/remux"
"github.com/go-chi/chi/v5"
"github.com/theparanoids/ashirt-server/backend"
"github.com/theparanoids/ashirt-server/backend/authschemes"
"github.com/theparanoids/ashirt-server/backend/authschemes/recoveryauth/constants"
"github.com/theparanoids/ashirt-server/backend/logging"
"github.com/theparanoids/ashirt-server/backend/server/middleware"
"github.com/theparanoids/ashirt-server/backend/server/remux"
)

type RecoveryAuthScheme struct {
Expand Down
16 changes: 8 additions & 8 deletions backend/authschemes/recoveryauth/services.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ import (
"context"
"time"

"github.com/theparanoids/ashirt-server/backend"
"github.com/theparanoids/ashirt-server/backend/authschemes"
recoveryConsts "github.com/theparanoids/ashirt-server/backend/authschemes/recoveryauth/constants"
recoveryHelpers "github.com/theparanoids/ashirt-server/backend/authschemes/recoveryauth/helpers"
"github.com/theparanoids/ashirt-server/backend/database"
"github.com/theparanoids/ashirt-server/backend/emailtemplates"
"github.com/theparanoids/ashirt-server/backend/policy"
"github.com/theparanoids/ashirt-server/backend/server/middleware"
"github.com/ashirt-ops/ashirt-server/backend"
"github.com/ashirt-ops/ashirt-server/backend/authschemes"
recoveryConsts "github.com/ashirt-ops/ashirt-server/backend/authschemes/recoveryauth/constants"
recoveryHelpers "github.com/ashirt-ops/ashirt-server/backend/authschemes/recoveryauth/helpers"
"github.com/ashirt-ops/ashirt-server/backend/database"
"github.com/ashirt-ops/ashirt-server/backend/emailtemplates"
"github.com/ashirt-ops/ashirt-server/backend/policy"
"github.com/ashirt-ops/ashirt-server/backend/server/middleware"

sq "github.com/Masterminds/squirrel"
)
Expand Down
16 changes: 8 additions & 8 deletions backend/authschemes/recoveryauth/services_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ import (
"time"

sq "github.com/Masterminds/squirrel"
"github.com/ashirt-ops/ashirt-server/backend/authschemes"
"github.com/ashirt-ops/ashirt-server/backend/authschemes/recoveryauth"
recoveryConsts "github.com/ashirt-ops/ashirt-server/backend/authschemes/recoveryauth/constants"
"github.com/ashirt-ops/ashirt-server/backend/database"
"github.com/ashirt-ops/ashirt-server/backend/database/seeding"
"github.com/ashirt-ops/ashirt-server/backend/helpers"
"github.com/ashirt-ops/ashirt-server/backend/models"
"github.com/ashirt-ops/ashirt-server/backend/session"
"github.com/stretchr/testify/require"
"github.com/theparanoids/ashirt-server/backend/authschemes"
"github.com/theparanoids/ashirt-server/backend/authschemes/recoveryauth"
recoveryConsts "github.com/theparanoids/ashirt-server/backend/authschemes/recoveryauth/constants"
"github.com/theparanoids/ashirt-server/backend/database"
"github.com/theparanoids/ashirt-server/backend/database/seeding"
"github.com/theparanoids/ashirt-server/backend/helpers"
"github.com/theparanoids/ashirt-server/backend/models"
"github.com/theparanoids/ashirt-server/backend/session"
)

func initBridge(t *testing.T) authschemes.AShirtAuthBridge {
Expand Down
2 changes: 1 addition & 1 deletion backend/authschemes/user_profile.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
package authschemes

import (
"github.com/theparanoids/ashirt-server/backend/services"
"github.com/ashirt-ops/ashirt-server/backend/services"
)

// UserProfile containes the necessary information to create a new user
Expand Down
14 changes: 7 additions & 7 deletions backend/authschemes/webauthn/webauthn.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ import (
"strings"
"time"

"github.com/ashirt-ops/ashirt-server/backend"
"github.com/ashirt-ops/ashirt-server/backend/authschemes"
"github.com/ashirt-ops/ashirt-server/backend/authschemes/webauthn/constants"
"github.com/ashirt-ops/ashirt-server/backend/config"
"github.com/ashirt-ops/ashirt-server/backend/helpers"
"github.com/ashirt-ops/ashirt-server/backend/server/middleware"
"github.com/ashirt-ops/ashirt-server/backend/server/remux"
"github.com/go-chi/chi/v5"
"github.com/theparanoids/ashirt-server/backend"
"github.com/theparanoids/ashirt-server/backend/authschemes"
"github.com/theparanoids/ashirt-server/backend/authschemes/webauthn/constants"
"github.com/theparanoids/ashirt-server/backend/config"
"github.com/theparanoids/ashirt-server/backend/helpers"
"github.com/theparanoids/ashirt-server/backend/server/middleware"
"github.com/theparanoids/ashirt-server/backend/server/remux"

"github.com/go-webauthn/webauthn/protocol"
auth "github.com/go-webauthn/webauthn/webauthn"
Expand Down
2 changes: 1 addition & 1 deletion backend/authschemes/webauthn/webauthnuser.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"strings"
"time"

"github.com/ashirt-ops/ashirt-server/backend/helpers"
auth "github.com/go-webauthn/webauthn/webauthn"
"github.com/google/uuid"
"github.com/theparanoids/ashirt-server/backend/helpers"
)

type webauthnUser struct {
Expand Down
12 changes: 6 additions & 6 deletions backend/bin/api/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ import (
"errors"
"net/http"

"github.com/ashirt-ops/ashirt-server/backend"
"github.com/ashirt-ops/ashirt-server/backend/config"
"github.com/ashirt-ops/ashirt-server/backend/config/confighelpers"
"github.com/ashirt-ops/ashirt-server/backend/database"
"github.com/ashirt-ops/ashirt-server/backend/logging"
"github.com/ashirt-ops/ashirt-server/backend/server"
"github.com/go-chi/chi/v5"
"github.com/theparanoids/ashirt-server/backend"
"github.com/theparanoids/ashirt-server/backend/config"
"github.com/theparanoids/ashirt-server/backend/config/confighelpers"
"github.com/theparanoids/ashirt-server/backend/database"
"github.com/theparanoids/ashirt-server/backend/logging"
"github.com/theparanoids/ashirt-server/backend/server"
)

func main() {
Expand Down

0 comments on commit d29ce9d

Please sign in to comment.