Compare commits
7
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
754479eb98 | ||
|
|
5974ec1dba | ||
|
|
c5ed657d3e | ||
|
|
02adbb2522 | ||
|
|
4b466f314e | ||
|
|
6531526278 | ||
|
|
bc0739f707 |
+6
@@ -1,5 +1,7 @@
|
|||||||
package com.alttd.altitudeweb.controllers.data_from_auth;
|
package com.alttd.altitudeweb.controllers.data_from_auth;
|
||||||
|
|
||||||
|
import com.nimbusds.jwt.JWT;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.http.HttpStatus;
|
import org.springframework.http.HttpStatus;
|
||||||
import org.springframework.security.core.Authentication;
|
import org.springframework.security.core.Authentication;
|
||||||
@@ -10,6 +12,7 @@ import org.springframework.web.server.ResponseStatusException;
|
|||||||
|
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
@Service
|
@Service
|
||||||
public class AuthenticatedUuid {
|
public class AuthenticatedUuid {
|
||||||
@Value("${UNSECURED:#{false}}")
|
@Value("${UNSECURED:#{false}}")
|
||||||
@@ -25,6 +28,9 @@ public class AuthenticatedUuid {
|
|||||||
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
|
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
|
||||||
|
|
||||||
if (authentication == null || !(authentication.getPrincipal() instanceof Jwt jwt)) {
|
if (authentication == null || !(authentication.getPrincipal() instanceof Jwt jwt)) {
|
||||||
|
log.error("Authentication principal is null {} or not a JWT {}",
|
||||||
|
authentication == null, authentication == null ?
|
||||||
|
"null" : authentication.getPrincipal() instanceof JWT);
|
||||||
if (unsecured) {
|
if (unsecured) {
|
||||||
return UUID.fromString("55e46bc3-2a29-4c53-850f-dbd944dc5c5f");
|
return UUID.fromString("55e46bc3-2a29-4c53-850f-dbd944dc5c5f");
|
||||||
}
|
}
|
||||||
|
|||||||
+6
-3
@@ -242,6 +242,8 @@ public class HistoryApiController implements HistoryApi {
|
|||||||
HistoryType historyTypeEnum = HistoryType.getHistoryType(type);
|
HistoryType historyTypeEnum = HistoryType.getHistoryType(type);
|
||||||
CompletableFuture<PunishmentHistoryDto> result = new CompletableFuture<>();
|
CompletableFuture<PunishmentHistoryDto> result = new CompletableFuture<>();
|
||||||
|
|
||||||
|
final UUID actor = authenticatedUuid.getAuthenticatedUserUuid();
|
||||||
|
|
||||||
Connection.getConnection(Databases.LITE_BANS).runQuery(sqlSession -> {
|
Connection.getConnection(Databases.LITE_BANS).runQuery(sqlSession -> {
|
||||||
try {
|
try {
|
||||||
IdHistoryMapper idMapper = sqlSession.getMapper(IdHistoryMapper.class);
|
IdHistoryMapper idMapper = sqlSession.getMapper(IdHistoryMapper.class);
|
||||||
@@ -253,7 +255,6 @@ public class HistoryApiController implements HistoryApi {
|
|||||||
}
|
}
|
||||||
int changed = editMapper.setReason(historyTypeEnum, id, reason);
|
int changed = editMapper.setReason(historyTypeEnum, id, reason);
|
||||||
HistoryRecord after = idMapper.getRecentHistory(historyTypeEnum, id);
|
HistoryRecord after = idMapper.getRecentHistory(historyTypeEnum, id);
|
||||||
UUID actor = authenticatedUuid.getAuthenticatedUserUuid();
|
|
||||||
log.info("[Punishment Edit] Actor={} Type={} Id={} Reason: '{}' -> '{}' (rows={})",
|
log.info("[Punishment Edit] Actor={} Type={} Id={} Reason: '{}' -> '{}' (rows={})",
|
||||||
actor, historyTypeEnum, id, before.getReason(), after != null ? after.getReason() : null, changed);
|
actor, historyTypeEnum, id, before.getReason(), after != null ? after.getReason() : null, changed);
|
||||||
result.complete(after != null ? mapPunishmentHistory(after) : null);
|
result.complete(after != null ? mapPunishmentHistory(after) : null);
|
||||||
@@ -275,6 +276,8 @@ public class HistoryApiController implements HistoryApi {
|
|||||||
HistoryType historyTypeEnum = HistoryType.getHistoryType(type);
|
HistoryType historyTypeEnum = HistoryType.getHistoryType(type);
|
||||||
CompletableFuture<PunishmentHistoryDto> result = new CompletableFuture<>();
|
CompletableFuture<PunishmentHistoryDto> result = new CompletableFuture<>();
|
||||||
|
|
||||||
|
final UUID actor = authenticatedUuid.getAuthenticatedUserUuid();
|
||||||
|
|
||||||
Connection.getConnection(Databases.LITE_BANS).runQuery(sqlSession -> {
|
Connection.getConnection(Databases.LITE_BANS).runQuery(sqlSession -> {
|
||||||
try {
|
try {
|
||||||
IdHistoryMapper idMapper = sqlSession.getMapper(IdHistoryMapper.class);
|
IdHistoryMapper idMapper = sqlSession.getMapper(IdHistoryMapper.class);
|
||||||
@@ -286,7 +289,6 @@ public class HistoryApiController implements HistoryApi {
|
|||||||
}
|
}
|
||||||
int changed = editMapper.setUntil(historyTypeEnum, id, until);
|
int changed = editMapper.setUntil(historyTypeEnum, id, until);
|
||||||
HistoryRecord after = idMapper.getRecentHistory(historyTypeEnum, id);
|
HistoryRecord after = idMapper.getRecentHistory(historyTypeEnum, id);
|
||||||
UUID actor = authenticatedUuid.getAuthenticatedUserUuid();
|
|
||||||
log.info("[Punishment Edit] Actor={} Type={} Id={} Until: '{}' -> '{}' (rows={})",
|
log.info("[Punishment Edit] Actor={} Type={} Id={} Until: '{}' -> '{}' (rows={})",
|
||||||
actor, historyTypeEnum, id, before.getUntil(), after != null ? after.getUntil() : null, changed);
|
actor, historyTypeEnum, id, before.getUntil(), after != null ? after.getUntil() : null, changed);
|
||||||
result.complete(after != null ? mapPunishmentHistory(after) : null);
|
result.complete(after != null ? mapPunishmentHistory(after) : null);
|
||||||
@@ -311,6 +313,8 @@ public class HistoryApiController implements HistoryApi {
|
|||||||
HistoryType historyTypeEnum = HistoryType.getHistoryType(type);
|
HistoryType historyTypeEnum = HistoryType.getHistoryType(type);
|
||||||
CompletableFuture<Boolean> result = new CompletableFuture<>();
|
CompletableFuture<Boolean> result = new CompletableFuture<>();
|
||||||
|
|
||||||
|
final UUID actorUuid = authenticatedUuid.getAuthenticatedUserUuid();
|
||||||
|
|
||||||
Connection.getConnection(Databases.LITE_BANS).runQuery(sqlSession -> {
|
Connection.getConnection(Databases.LITE_BANS).runQuery(sqlSession -> {
|
||||||
try {
|
try {
|
||||||
IdHistoryMapper idMapper = sqlSession.getMapper(IdHistoryMapper.class);
|
IdHistoryMapper idMapper = sqlSession.getMapper(IdHistoryMapper.class);
|
||||||
@@ -320,7 +324,6 @@ public class HistoryApiController implements HistoryApi {
|
|||||||
result.complete(false);
|
result.complete(false);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
UUID actorUuid = authenticatedUuid.getAuthenticatedUserUuid();
|
|
||||||
String actorName = sqlSession.getMapper(RecentNamesMapper.class).getUsername(actorUuid.toString());
|
String actorName = sqlSession.getMapper(RecentNamesMapper.class).getUsername(actorUuid.toString());
|
||||||
int changed = editMapper.remove(historyTypeEnum, id);
|
int changed = editMapper.remove(historyTypeEnum, id);
|
||||||
log.info("[Punishment Remove] Actor={} ({}) Type={} Id={} Before(active={} removedBy={} reason='{}') (rows={})",
|
log.info("[Punishment Remove] Actor={} ({}) Type={} Id={} Before(active={} removedBy={} reason='{}') (rows={})",
|
||||||
|
|||||||
+1
-1
@@ -21,7 +21,7 @@ public interface VotingPluginUsersMapper {
|
|||||||
WeeklyTotal as totalVotesThisWeek,
|
WeeklyTotal as totalVotesThisWeek,
|
||||||
MonthTotal as totalVotesThisMonth,
|
MonthTotal as totalVotesThisMonth,
|
||||||
AllTimeTotal as totalVotesAllTime
|
AllTimeTotal as totalVotesAllTime
|
||||||
FROM votingplugin.votingplugin_users
|
FROM votingplugin.VotingPlugin_Users
|
||||||
WHERE uuid = #{uuid}
|
WHERE uuid = #{uuid}
|
||||||
""")
|
""")
|
||||||
Optional<VotingStatsRow> getStatsByUuid(@Param("uuid") UUID uuid);
|
Optional<VotingStatsRow> getStatsByUuid(@Param("uuid") UUID uuid);
|
||||||
|
|||||||
Reference in New Issue
Block a user