Commit dd35468f authored by Andrei Mihu's avatar Andrei Mihu
Browse files

Build with Go 1.18.3 release.

parent 50642ad0

CHANGELOG.md

+1 −0
Changes for CHANGELOG.md: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ The format is based on [keep a changelog](http://keepachangelog.com) and this pr 
- Improve validation of count multiple matchmaker parameter.

- Stricter validation of devconsole user email inputs.

- Added next and previous cursor to results of the Leaderboard/TournamentRecordsAroundOwner API and Leaderboard/TournamentRecordsHaystack runtime functions.

- Build with Go 1.18.3 release.



## [3.12.0] - 2022-05-22

### Added

build/Dockerfile

+1 −1
Changes for build/Dockerfile: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
# docker build "$PWD" --build-arg commit="$(git rev-parse --short HEAD)" --build-arg version=v2.1.1 -t heroiclabs/nakama:2.1.1

# docker build "$PWD" --build-arg commit="$(git rev-parse --short HEAD)" --build-arg version="$(git rev-parse --short HEAD)" -t heroiclabs/nakama-prerelease:"$(git rev-parse --short HEAD)"



FROM golang:1.18.2-buster as builder

FROM golang:1.18.3-buster as builder



ARG commit

ARG version

build/Dockerfile.dsym

+1 −1
Changes for build/Dockerfile.dsym: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
# docker build "$PWD" --build-arg commit="$(git rev-parse --short HEAD)" --build-arg version=v2.1.1 -t heroiclabs/nakama:2.1.1

# docker build "$PWD" --build-arg commit="$(git rev-parse --short HEAD)" --build-arg version="v2.1.1-$(git rev-parse --short HEAD)" -t heroiclabs/nakama-prerelease:"2.1.1-$(git rev-parse --short HEAD)"



FROM golang:1.18.2-buster as builder

FROM golang:1.18.3-buster as builder



ARG commit

ARG version

build/pluginbuilder/Dockerfile

+1 −1
Changes for build/pluginbuilder/Dockerfile: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
# docker build "$PWD" --file ./Dockerfile.pluginbuilder --build-arg commit="$(git rev-parse --short HEAD)" --build-arg version=v2.1.1 -t heroiclabs/nakama-pluginbuilder:2.1.1

# docker build "$PWD" --file ./Dockerfile.pluginbuilder --build-arg commit="$(git rev-parse --short HEAD)" --build-arg version="v2.1.1-$(git rev-parse --short HEAD)" -t heroiclabs/nakama-prerelease:"2.1.1-$(git rev-parse --short HEAD)"



FROM golang:1.18.2-buster as builder

FROM golang:1.18.3-buster as builder



MAINTAINER Heroic Labs <support@heroiclabs.com>

server/login_attempt_cache.go

+14 −14
Changes for server/login_attempt_cache.go: 14 added lines, 14 removed lines.
Original line number Diff line number Diff line
@@ -156,19 +156,19 @@ func (c *LocalLoginAttemptCache) Add(account, ip string) (LockoutType, time.Time 
			lockoutType = LockoutTypeAccount

		}

	}

	if ip != "" {

		status, found := c.ipCache[ip]

		if !found {

			status = &lockoutStatus{}

			c.ipCache[ip] = status

		}

		status.attempts = append(status.attempts, now)

		_ = status.trim(now, lockoutPeriodIp)

		if len(status.attempts) >= maxAttemptsIp {

			status.lockedUntil = now.Add(lockoutPeriodIp)

			lockedUntil = status.lockedUntil

			lockoutType = LockoutTypeIp

		}

	}

	//if ip != "" {

	//	status, found := c.ipCache[ip]

	//	if !found {

	//		status = &lockoutStatus{}

	//		c.ipCache[ip] = status

	//	}

	//	status.attempts = append(status.attempts, now)

	//	_ = status.trim(now, lockoutPeriodIp)

	//	if len(status.attempts) >= maxAttemptsIp {

	//		status.lockedUntil = now.Add(lockoutPeriodIp)

	//		lockedUntil = status.lockedUntil

	//		lockoutType = LockoutTypeIp

	//	}

	//}

	return lockoutType, lockedUntil

}