Skip to content

Commit

Permalink
resolves #1604 upgrade C4 PlantUML definition files to 2.7.0 (#1605)
Browse files Browse the repository at this point in the history
  • Loading branch information
rlespinasse committed Aug 2, 2023
1 parent 2b20ac9 commit 9823c6b
Show file tree
Hide file tree
Showing 8 changed files with 1,375 additions and 524 deletions.
4 changes: 4 additions & 0 deletions server/src/main/java/io/kroki/server/service/Plantuml.java
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@ public class Plantuml implements DiagramService {
private static final String c4Deployment = c4Container + read("c4_deployment.puml");
// dynamic includes component
private static final String c4Dynamic = c4Component + read("c4_dynamic.puml");
// sequence includes component
private static final String c4Sequence = c4Component + read("c4_sequence.puml");
private final SourceDecoder sourceDecoder;
private final List<Pattern> includeWhitelist;
private static final List<String> STDLIB = Arrays.asList(
Expand Down Expand Up @@ -292,6 +294,8 @@ private static void ignoreInclude(String line, StringBuilder sb, SafeMode safeMo
sb.append(c4Deployment).append("\n");
} else if (include.toLowerCase().contains("c4_dynamic.puml")) {
sb.append(c4Dynamic).append("\n");
} else if (include.toLowerCase().contains("c4_sequence.puml")) {
sb.append(c4Sequence).append("\n");
} else if (safeMode.value < SafeMode.SECURE.value) {
if (!include.startsWith("<") // includes starting with < must only come from stdlib
&& !include.startsWith("/") && !include.startsWith("\\") // no absolute paths,
Expand Down
Loading

0 comments on commit 9823c6b

Please sign in to comment.