Merge 628e2972e6 into 9561846979

Update workflow actions and Go versions (#3245 )
This PR: * Updates the versions of various actions used by the CI and release workflows * Updates the release workflow to use Go version 1.22 * Updates the test matrix to use Go versions 1.21, 1.22, and 1.23 It also updates the CI workflow to run when pull requests are created or changed. This will help give feedback when formatting or tests are broken during a PR. As a good example of why this is useful, you'll see that I needed to run `gofmt` to get this to pass! We should have caught that earlier and now we'll catch it moving forward.
2024-11-21 01:14:13 +00:00 · 2024-09-22 23:24:43 -05:00 · 2024-09-22 22:53:08 -05:00 · 2022-12-03 06:41:10 +00:00
6 changed files with 28 additions and 31 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -1,5 +1,7 @@
 name: CI
-on: [push]
+on:
+  - pull_request
+  - push
 jobs:

  build:
@ -7,17 +9,17 @@ jobs:
    runs-on: ubuntu-latest
    strategy:
      matrix:
-        goVer: [1.16, 1.17, 1.18]
+        goVer: [1.21, 1.22, 1.23]

    steps:
    - name: Set up Go ${{ matrix.goVer }}
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v5
      with:
        go-version: ${{ matrix.goVer }}
      id: go

    - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4

    - name: Get dependencies
      run: |
@ -31,4 +33,4 @@ jobs:
      run: diff -u <(echo -n) <(gofmt -d .)
    
    - name: Test
-      run: go test -v ./...
+      run: go test ./...
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -38,7 +38,7 @@ jobs:
            - name: Set up Go
              uses: actions/setup-go@v2
              with:
-                go-version: 1.14
+                go-version: 1.22
            - if: matrix.os == 'ubuntu-latest'
              run: sudo apt-get update && sudo apt-get install -y gcc-multilib
            - if: matrix.arch == '386'
@ -47,7 +47,7 @@ jobs:
              run: echo "RELEASE=gophish-${{ github.event.release.tag_name }}-${{ matrix.releaseos }}-64bit" >> $GITHUB_ENV
            - if: matrix.os == 'windows-latest'
              run: echo "RELEASE=gophish-${{ github.event.release.tag_name }}-${{ matrix.releaseos }}-64bit" | Out-File -FilePath $env:GITHUB_ENV -Append # https://github.com/actions/runner/issues/1636
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v4
            - name: Build ${{ matrix.goos }}/${{ matrix.arch }}
              run: go build -o ${{ matrix.bin }}
              env:
@ -55,7 +55,7 @@ jobs:
                GOARCH: ${{ matrix.arch }}
                CGO_ENABLED: 1
            - name: Upload to artifacts
-              uses: actions/upload-artifact@v2
+              uses: actions/upload-artifact@v4
              with:
                name: ${{ env.RELEASE }}
                path: ${{ matrix.bin }}
@ -65,8 +65,8 @@ jobs:
        runs-on: ubuntu-latest
        needs: build
        steps:
-            - uses: actions/checkout@v2
-            - uses: actions/download-artifact@v2
+            - uses: actions/checkout@v4
+            - uses: actions/download-artifact@v4
              with:
                path: bin
            - name: Package Releases
@ -96,7 +96,7 @@ jobs:
                  done
                done
            - name: Upload to artifacts
-              uses: actions/upload-artifact@v2
+              uses: actions/upload-artifact@v4
              with:
                name: releases
                path: releases/*.zip
@ -106,7 +106,7 @@ jobs:
        runs-on: ubuntu-latest
        needs: package
        steps:
-            - uses: actions/download-artifact@v2
+            - uses: actions/download-artifact@v4
              with:
                name: releases
                path: releases/
--- a/controllers/api/user.go
+++ b/controllers/api/user.go
@ -109,6 +109,7 @@ func (as *Server) Users(w http.ResponseWriter, r *http.Request) {
 			Role:                   role,
 			RoleID:                 role.ID,
 			PasswordChangeRequired: ur.PasswordChangeRequired,
+			AccountLocked:          ur.AccountLocked,
 		}
 		err = models.PutUser(&user)
 		if err != nil {
--- a/imap/monitor.go
+++ b/imap/monitor.go
@ -115,8 +115,8 @@ func (im *Monitor) Shutdown() error {
 	return nil
 }

-// checkForNewEmails logs into an IMAP account and checks unread emails
-//  for the rid campaign identifier.
+// checkForNewEmails logs into an IMAP account and checks unread emails for the
+// rid campaign identifier.
 func checkForNewEmails(im models.IMAP) {
 	im.Host = im.Host + ":" + strconv.Itoa(int(im.Port)) // Append port
 	mailServer := Mailbox{
--- a/models/campaign.go
+++ b/models/campaign.go
@ -609,7 +609,7 @@ func PostCampaign(c *Campaign, uid int64) error {
 	return tx.Commit().Error
 }

-//DeleteCampaign deletes the specified campaign
+// DeleteCampaign deletes the specified campaign
 func DeleteCampaign(id int64) error {
 	log.WithFields(logrus.Fields{
 		"campaign_id": id,
--- a/yarn.lock
+++ b/yarn.lock
@ -1499,7 +1499,7 @@ colorette@^1.2.2:
  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
  integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==

-commander@^2.19.0, commander@~2.20.0:
+commander@^2.19.0:
  version "2.20.0"
  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
  integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
@ -1712,9 +1712,9 @@ decamelize@^1.1.1, decamelize@^1.2.0:
  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=

 decode-uri-component@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
-  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
+  integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==

 deep-extend@^0.6.0:
  version "0.6.0"
@ -2963,18 +2963,17 @@ jshint-stylish@^2.2.1:
    string-length "^1.0.0"
    text-table "^0.2.0"

-jshint@^2.10.2:
-  version "2.10.2"
-  resolved "https://registry.yarnpkg.com/jshint/-/jshint-2.10.2.tgz#ed6626c4f8223c98e94aaea62767435427a49a3d"
-  integrity sha512-e7KZgCSXMJxznE/4WULzybCMNXNAd/bf5TSrvVEq78Q/K8ZwFpmBqQeDtNiHc3l49nV4E/+YeHU/JZjSUIrLAA==
+jshint@^2.13.4:
+  version "2.13.6"
+  resolved "https://registry.yarnpkg.com/jshint/-/jshint-2.13.6.tgz#3679a2687a3066fa9034ef85d8c305613a31eec6"
+  integrity sha512-IVdB4G0NTTeQZrBoM8C5JFVLjV2KtZ9APgybDA1MK73xb09qFs0jCXyQLnCOp1cSZZZbvhq/6mfXHUTaDkffuQ==
  dependencies:
    cli "~1.0.0"
    console-browserify "1.1.x"
    exit "0.1.x"
    htmlparser2 "3.8.x"
-    lodash "~4.17.11"
+    lodash "~4.17.21"
    minimatch "~3.0.2"
-    shelljs "0.3.x"
    strip-json-comments "1.0.x"

 json-parse-better-errors@^1.0.2:
@ -3143,7 +3142,7 @@ lodash.merge@^4.6.0:
  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
  integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==

-lodash@^4.12.0, lodash@^4.17.11, lodash@~4.17.11:
+lodash@^4.12.0, lodash@^4.17.11, lodash@~4.17.21:
  version "4.17.21"
  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@ -4403,11 +4402,6 @@ shebang-regex@^1.0.0:
  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=

-shelljs@0.3.x:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.3.0.tgz#3596e6307a781544f591f37da618360f31db57b1"
-  integrity sha1-NZbmMHp4FUT1kfN9phg2DzHbV7E=
-
 signal-exit@^3.0.0:
  version "3.0.2"
  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
Author	SHA1	Message	Date
dependabot[bot]	d59a17f718	Merge `628e2972e6` into `9561846979`	2024-11-21 01:14:13 +00:00
Jordan Wright	9561846979	Update workflow actions and Go versions (#3245 ) This PR: * Updates the versions of various actions used by the CI and release workflows * Updates the release workflow to use Go version 1.22 * Updates the test matrix to use Go versions 1.21, 1.22, and 1.23 It also updates the CI workflow to run when pull requests are created or changed. This will help give feedback when formatting or tests are broken during a PR. As a good example of why this is useful, you'll see that I needed to run `gofmt` to get this to pass! We should have caught that earlier and now we'll catch it moving forward.	2024-09-22 23:24:43 -05:00
Caetan	908886f2cd	Enforce account locks when creating new users (#3173 ) Properly enforce account locks when new users are created --------- Co-authored-by: Caetan Tojeiro Carpente <caetan.tojeiro@tier8.com>	2024-09-22 22:53:08 -05:00
dependabot[bot]	628e2972e6	Bump decode-uri-component from 0.2.0 to 0.2.2 Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component) from 0.2.0 to 0.2.2. - [Release notes](https://github.com/SamVerschueren/decode-uri-component/releases) - [Commits](https://github.com/SamVerschueren/decode-uri-component/compare/v0.2.0...v0.2.2) --- updated-dependencies: - dependency-name: decode-uri-component dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2022-12-03 06:41:10 +00:00