Skip to content

Commit 61fd2aa

Browse files
phrockerphrocker
committed
Fixup
1 parent 1b06af8 commit 61fd2aa

6 files changed

Lines changed: 80 additions & 18 deletions

File tree

‎.local.env‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
SENTRIUS_VERSION=1.1.334
1+
SENTRIUS_VERSION=1.1.341
22
SENTRIUS_SSH_VERSION=1.1.41
33
SENTRIUS_KEYCLOAK_VERSION=1.1.53
44
SENTRIUS_AGENT_VERSION=1.1.42

‎.local.env.bak‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
SENTRIUS_VERSION=1.1.334
1+
SENTRIUS_VERSION=1.1.341
22
SENTRIUS_SSH_VERSION=1.1.41
33
SENTRIUS_KEYCLOAK_VERSION=1.1.53
44
SENTRIUS_AGENT_VERSION=1.1.42

‎api/src/main/java/io/sentrius/sso/controllers/api/UserApiController.java‎

Lines changed: 39 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import java.util.HashMap;
77
import java.util.List;
88
import java.util.Map;
9+
import java.util.Objects;
910
import com.fasterxml.jackson.core.JsonProcessingException;
1011
import com.fasterxml.jackson.databind.JsonNode;
1112
import com.fasterxml.jackson.databind.node.BooleanNode;
@@ -15,7 +16,10 @@
1516
import io.sentrius.sso.core.annotations.LimitAccess;
1617
import io.sentrius.sso.core.config.SystemOptions;
1718
import io.sentrius.sso.core.controllers.BaseController;
19+
import io.sentrius.sso.core.dto.HostGroupDTO;
20+
import io.sentrius.sso.core.dto.UserPublicKeyDTO;
1821
import io.sentrius.sso.core.exceptions.ZtatException;
22+
import io.sentrius.sso.core.model.hostgroup.HostGroup;
1923
import io.sentrius.sso.core.model.security.UserType;
2024
import io.sentrius.sso.core.model.security.enums.UserAccessEnum;
2125
import io.sentrius.sso.core.model.users.User;
@@ -24,6 +28,7 @@
2428
import io.sentrius.sso.core.model.users.UserConfig;
2529
import io.sentrius.sso.core.model.users.UserPublicKey;
2630
import io.sentrius.sso.core.model.users.UserSettings;
31+
import io.sentrius.sso.core.services.ConfigurationService;
2732
import io.sentrius.sso.core.services.ErrorOutputService;
2833
import io.sentrius.sso.core.services.HostGroupService;
2934
import io.sentrius.sso.core.services.SessionService;
@@ -438,24 +443,51 @@ private List<Map<String, Object>> getAgentSessionDurations() {
438443
// Public Key Management Endpoints
439444

440445
@GetMapping("/publickeys")
441-
public ResponseEntity<List<UserPublicKey>> getUserPublicKeys(HttpServletRequest request, HttpServletResponse response) {
446+
public ResponseEntity<List<UserPublicKeyDTO>> getUserPublicKeys(HttpServletRequest request,
447+
HttpServletResponse response) {
442448
var user = userService.getOperatingUser(request, response, null);
443449
var publicKeys = userPublicKeyService.getPublicKeysForUser(user.getId());
444-
return ResponseEntity.ok(publicKeys);
450+
List<UserPublicKeyDTO> publicKeyDTOs = new ArrayList<>();
451+
for (UserPublicKey key : publicKeys) {
452+
UserPublicKeyDTO dto = UserPublicKeyDTO.builder().build();
453+
//dto.setId(key.getId());
454+
dto.setKeyName(key.getKeyName());
455+
dto.setKeyType(key.getKeyType());
456+
dto.setPublicKey(key.getPublicKey());
457+
dto.setIsEnabled(key.getIsEnabled());
458+
if (key.getHostGroup() != null) {
459+
dto.setHostGroup( HostGroupDTO.builder().groupId(key.getHostGroup().getId()).build());
460+
//dto.setHostGroupName(key.getHostGroup().getName());
461+
}
462+
publicKeyDTOs.add(dto);
463+
}
464+
return ResponseEntity.ok(publicKeyDTOs);
445465
}
446466

447467
@PostMapping("/publickeys")
448-
public ResponseEntity<ObjectNode> addPublicKey(HttpServletRequest request, HttpServletResponse response, @RequestBody UserPublicKey publicKey) {
468+
public ResponseEntity<ObjectNode> addPublicKey(HttpServletRequest request, HttpServletResponse response, @RequestBody
469+
UserPublicKeyDTO publicKey) {
449470
ObjectNode node = JsonUtil.MAPPER.createObjectNode();
450471
try {
472+
473+
HostGroup hostGroup = hostGroupService.getHostGroup(publicKey.getHostGroup().getGroupId());
474+
Objects.requireNonNull(hostGroup);
475+
476+
UserPublicKey key = new UserPublicKey();
477+
key.setKeyName(publicKey.getKeyName());
478+
key.setKeyType(publicKey.getKeyType());
479+
key.setPublicKey(publicKey.getPublicKey());
480+
key.setIsEnabled(publicKey.getIsEnabled());
481+
key.setHostGroup(hostGroup);
482+
451483
var user = userService.getOperatingUser(request, response, null);
452-
publicKey.setUser(user);
484+
key.setUser(user);
453485

454-
if (publicKey.getCreatedAt() == null) {
455-
publicKey.setCreatedAt(new java.sql.Timestamp(System.currentTimeMillis()));
486+
if (key.getCreatedAt() == null) {
487+
key.setCreatedAt(new java.sql.Timestamp(System.currentTimeMillis()));
456488
}
457489

458-
var savedKey = userPublicKeyService.addPublicKey(publicKey);
490+
var savedKey = userPublicKeyService.addPublicKey(key);
459491
node.put("status", "Public key successfully added");
460492
node.put("id", savedKey.getId());
461493
return ResponseEntity.ok(node);

‎api/src/main/resources/templates/sso/users/user_settings.html‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33

44
<head>
55
<meta th:replace="~{fragments/header}">
6-
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet">
7-
<link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0-beta3/css/all.min.css" rel="stylesheet">
86
<style>
97
.center-container {
108
display: flex;
@@ -142,6 +140,7 @@
142140
<div class="container-fluid">
143141
<div class="row flex-nowrap">
144142
<!-- Sidebar -->
143+
<input type="hidden" id="csrf-token" th:value="${_csrf.token}" />
145144
<div th:replace="~{fragments/sidebar}" class="col-auto sidebar" style="width: 180px;"></div>
146145

147146
<!-- Main content -->
@@ -390,11 +389,14 @@ <h5 class="modal-title" id="assignModalLabel">
390389
}
391390
});
392391

392+
const csrfToken = document.getElementById("csrf-token").value;
393+
393394
fetch('/api/v1/users/settings/workhours', {
394395
method: 'POST',
395396
headers: {
396397
'Content-Type': 'application/json',
397-
'X-Requested-With': 'XMLHttpRequest'
398+
'X-Requested-With': 'XMLHttpRequest',
399+
"X-CSRF-TOKEN": csrfToken
398400
},
399401
body: JSON.stringify(workHours)
400402
}).then(response => {
@@ -430,14 +432,17 @@ <h5 class="modal-title" id="assignModalLabel">
430432

431433
// Add host group if selected
432434
if (hostGroupId) {
433-
keyData.hostGroup = { id: parseInt(hostGroupId) };
435+
keyData.hostGroup = { groupId: parseInt(hostGroupId) };
434436
}
435437

438+
const csrfToken = document.getElementById("csrf-token").value;
439+
436440
fetch('/api/v1/users/publickeys', {
437441
method: 'POST',
438442
headers: {
439443
'Content-Type': 'application/json',
440-
'X-Requested-With': 'XMLHttpRequest'
444+
'X-Requested-With': 'XMLHttpRequest',
445+
"X-CSRF-TOKEN": csrfToken
441446
},
442447
body: JSON.stringify(keyData)
443448
})
@@ -472,11 +477,14 @@ <h5 class="modal-title" id="assignModalLabel">
472477
return;
473478
}
474479

480+
const csrfToken = document.getElementById("csrf-token").value;
481+
475482
fetch(`/api/v1/users/publickeys/${keyId}/assign`, {
476483
method: 'POST',
477484
headers: {
478485
'Content-Type': 'application/x-www-form-urlencoded',
479-
'X-Requested-With': 'XMLHttpRequest'
486+
'X-Requested-With': 'XMLHttpRequest',
487+
"X-CSRF-TOKEN": csrfToken
480488
},
481489
body: `hostGroupId=${hostGroupId}`
482490
})
@@ -498,11 +506,13 @@ <h5 class="modal-title" id="assignModalLabel">
498506
}
499507

500508
function deleteKey(keyId) {
509+
const csrfToken = document.getElementById("csrf-token").value;
501510
if (confirm('Are you sure you want to delete this public key? This action cannot be undone.')) {
502511
fetch(`/api/v1/users/publickeys/${keyId}`, {
503512
method: 'DELETE',
504513
headers: {
505-
'X-Requested-With': 'XMLHttpRequest'
514+
'X-Requested-With': 'XMLHttpRequest',
515+
"X-CSRF-TOKEN": csrfToken
506516
}
507517
})
508518
.then(response => response.json())
@@ -543,4 +553,4 @@ <h5 class="modal-title" id="assignModalLabel">
543553
</script>
544554
</body>
545555

546-
</html>
556+
</html>

‎api/src/test/java/io/sentrius/sso/controllers/api/UserPublicKeyApiControllerTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.fasterxml.jackson.databind.ObjectMapper;
44
import io.sentrius.sso.core.config.SystemOptions;
5+
import io.sentrius.sso.core.dto.UserPublicKeyDTO;
56
import io.sentrius.sso.core.model.users.User;
67
import io.sentrius.sso.core.model.users.UserPublicKey;
78
import io.sentrius.sso.core.model.hostgroup.HostGroup;
@@ -141,7 +142,7 @@ public void testAddPublicKey() {
141142
user.setId(1L);
142143
user.setUsername("testuser");
143144

144-
UserPublicKey newKey = new UserPublicKey();
145+
UserPublicKeyDTO newKey = UserPublicKeyDTO.builder().build();
145146
newKey.setKeyName("New Test Key");
146147
newKey.setKeyType("RSA");
147148
newKey.setPublicKey("ssh-rsa AAAAB3NzaC1yc2EAAA...");

‎core/src/main/java/io/sentrius/sso/core/dto/UserPublicKeyDTO.java‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package io.sentrius.sso.core.dto;
2+
3+
import java.util.ArrayList;
4+
import java.util.List;
5+
import lombok.Builder;
6+
import lombok.Getter;
7+
import lombok.Setter;
8+
9+
@Getter
10+
@Setter
11+
@Builder
12+
public class UserPublicKeyDTO {
13+
private String keyName;
14+
private String keyType;
15+
private String publicKey;
16+
private Boolean isEnabled;
17+
@Builder.Default
18+
private HostGroupDTO hostGroup = new HostGroupDTO();
19+
}

0 commit comments

Comments
 (0)