Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
templateService
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Bazarbay Tulenov
templateService
Commits
523acd85
Commit
523acd85
authored
Jan 26, 2024
by
Denis
Committed by
Denis Ligin
Jan 26, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Security issue fix
parent
32abbb6b
Pipeline
#375
failed with stage
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
12 deletions
+13
-12
src/main/java/kz/project/printedFormsService/config/SecurityContextUtils.java
...ject/printedFormsService/config/SecurityContextUtils.java
+1
-2
src/main/java/kz/project/printedFormsService/controller/GitlabTemplateController.java
...ntedFormsService/controller/GitlabTemplateController.java
+2
-4
src/main/java/kz/project/printedFormsService/service/impl/TemplateServiceImpl.java
...printedFormsService/service/impl/TemplateServiceImpl.java
+10
-6
No files found.
src/main/java/kz/project/printedFormsService/config/SecurityContextUtils.java
View file @
523acd85
package
kz.project.printedFormsService.config
;
import
kz.project.printedFormsService.exception.AccessDeniedException
;
import
kz.project.printedFormsService.exception.ValidationException
;
import
lombok.experimental.UtilityClass
;
import
org.springframework.security.core.GrantedAuthority
;
import
org.springframework.security.core.context.SecurityContextHolder
;
...
...
@@ -56,7 +55,7 @@ public class SecurityContextUtils {
);
}
public
static
String
getGitlabProjectBranchFromRole
()
throws
ValidationException
{
public
static
String
getGitlabProjectBranchFromRole
()
{
return
SecurityContextHolder
.
getContext
()
...
...
src/main/java/kz/project/printedFormsService/controller/GitlabTemplateController.java
View file @
523acd85
...
...
@@ -20,8 +20,6 @@ import org.springframework.web.bind.annotation.PutMapping;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RestController
;
import
java.io.IOException
;
@RestController
@RequiredArgsConstructor
@Slf4j
...
...
@@ -61,7 +59,7 @@ public class GitlabTemplateController {
})
public
ResponseEntity
<
TemplateDto
>
saveTemplate
(
@RequestBody
@Validated
GitlabUploadRequest
request
)
throws
IOException
,
ValidationException
{
)
{
return
ResponseEntity
.
ok
(
gitlabTemplateService
.
saveFromGitlab
(
request
));
}
...
...
@@ -93,7 +91,7 @@ public class GitlabTemplateController {
})
public
ResponseEntity
<
TemplateResponseDto
>
editTemplate
(
@RequestBody
@Validated
GitlabUploadRequest
request
)
throws
IOException
,
ValidationException
{
)
{
return
ResponseEntity
.
ok
(
gitlabTemplateService
.
updateFromGitlab
(
request
));
}
...
...
src/main/java/kz/project/printedFormsService/service/impl/TemplateServiceImpl.java
View file @
523acd85
package
kz.project.printedFormsService.service.impl
;
import
com.fasterxml.jackson.core.JsonProcessingException
;
import
kz.project.printedFormsService.config.SecurityContextUtils
;
import
kz.project.printedFormsService.controller.TemplateController
;
import
kz.project.printedFormsService.data.dto.TemplateDataForReportDto
;
import
kz.project.printedFormsService.data.dto.TemplateDto
;
...
...
@@ -10,10 +11,10 @@ import kz.project.printedFormsService.data.entity.TemplateEntity;
import
kz.project.printedFormsService.data.entity.TemplateEntityVersion
;
import
kz.project.printedFormsService.data.entity.TemplateFileInfoEntity
;
import
kz.project.printedFormsService.data.repository.*
;
import
kz.project.printedFormsService.exception.AccessDeniedException
;
import
kz.project.printedFormsService.exception.ValidationException
;
import
kz.project.printedFormsService.logging.ProcessLogger
;
import
kz.project.printedFormsService.service.TemplateService
;
import
lombok.RequiredArgsConstructor
;
import
org.springframework.data.domain.Page
;
import
org.springframework.data.domain.Pageable
;
import
org.springframework.stereotype.Service
;
...
...
@@ -22,10 +23,7 @@ import org.springframework.web.multipart.MultipartFile;
import
java.io.IOException
;
import
java.nio.charset.StandardCharsets
;
import
java.util.Arrays
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.*
;
@Service
public
class
TemplateServiceImpl
implements
TemplateService
{
...
...
@@ -146,12 +144,18 @@ public class TemplateServiceImpl implements TemplateService {
if
(
code
!=
null
)
{
Page
<
TemplateEntity
>
allByCode
=
repository
.
findAllByCode
(
pageable
,
code
);
Set
<
String
>
projects
=
SecurityContextUtils
.
getProjectRoleMap
().
keySet
();
Page
<
TemplateEntityVersion
>
allVersionsByCode
=
versionRepository
.
findAllByCode
(
pageable
,
code
);
processLogger
.
finish
(
TemplateController
.
class
,
new
Throwable
().
getStackTrace
()[
0
].
getMethodName
(),
"Получение всех шаблонов по коду"
);
if
(
allByCode
!=
null
&&
allVersionsByCode
!=
null
)
if
(
allByCode
!=
null
&&
allVersionsByCode
!=
null
)
{
if
(!
projects
.
containsAll
(
allByCode
.
stream
().
map
(
TemplateEntity:
:
getProject
).
toList
()))
{
throw
new
AccessDeniedException
(
"User does not have access to the project"
);
}
return
TemplateDto
.
toDtoList
(
allByCode
,
allVersionsByCode
);
}
if
(
allByCode
!=
null
)
return
TemplateDto
.
toDtoList
(
allByCode
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment