You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2023/09/13 07:46:48 UTC

[plc4x] branch develop updated: feat: Added some commented out code that dumps the decrypted parts of ETS6+ files (helps debug ETS parsing)

This is an automated email from the ASF dual-hosted git repository.

cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git


The following commit(s) were added to refs/heads/develop by this push:
     new 688c85e54c feat: Added some commented out code that dumps the decrypted parts of ETS6+ files (helps debug ETS parsing)
688c85e54c is described below

commit 688c85e54c46f7c60d89bc81d18f6dfcfa9c7557
Author: Christofer Dutz <cd...@apache.org>
AuthorDate: Wed Sep 13 09:46:24 2023 +0200

    feat: Added some commented out code that dumps the decrypted parts of ETS6+ files (helps debug ETS parsing)
---
 .../apache/plc4x/java/knxnetip/ets/EtsParser.java  | 32 ++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/plc4j/drivers/knxnetip/src/main/java/org/apache/plc4x/java/knxnetip/ets/EtsParser.java b/plc4j/drivers/knxnetip/src/main/java/org/apache/plc4x/java/knxnetip/ets/EtsParser.java
index 559fc24a9a..20824d9993 100644
--- a/plc4j/drivers/knxnetip/src/main/java/org/apache/plc4x/java/knxnetip/ets/EtsParser.java
+++ b/plc4j/drivers/knxnetip/src/main/java/org/apache/plc4x/java/knxnetip/ets/EtsParser.java
@@ -40,9 +40,15 @@ import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
 import javax.xml.xpath.*;
 import java.io.File;
 import java.io.IOException;
+import java.io.StringWriter;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.HashMap;
@@ -106,17 +112,28 @@ public class EtsParser {
                     File tempFile = new File(tempDir.toFile(), projectNumber + ".zip");
 
                     // Unzip the archive inside the archive.
+                    //noinspection CommentedOutCode
                     try (ZipFile projectZipFile = fileHandler.getProjectFiles(tempFile, password)) {
                         final FileHeader compressedProjectFileHeader = projectZipFile.getFileHeader("project.xml");
                         if (compressedProjectFileHeader == null) {
                             throw new PlcRuntimeException(String.format("Error accessing project header file: Project file 'project.xml' inside '%s.zip'.", projectNumber));
                         }
                         projectHeaderDoc = builder.parse(projectZipFile.getInputStream(compressedProjectFileHeader));
+
+                        // TODO: Leave this in, as it helps debug problems, wen a new ETS version comes out.
+                        // Print the document content to the console.
+                        //System.out.println("Project Header Doc:");
+                        //printDocument(projectHeaderDoc);
+
                         FileHeader projectFileFileHeader = projectZipFile.getFileHeader("0.xml");
                         if (projectFileFileHeader == null) {
                             throw new PlcRuntimeException("Error accessing project file.");
                         }
                         projectDoc = builder.parse(projectZipFile.getInputStream(projectFileFileHeader));
+
+                        // TODO: Leave this in, as it helps debug problems, wen a new ETS version comes out.
+                        //System.out.println("Project Doc:");
+                        //printDocument(projectDoc);
                     }
                 } else {
                     projectHeaderDoc = builder.parse(zipFile.getInputStream(projectFileHeader));
@@ -256,4 +273,19 @@ public class EtsParser {
         throw new PlcRuntimeException("Error determining project number.");
     }
 
+    @SuppressWarnings("All")
+    public void printDocument(Document doc) {
+        try {
+            DOMSource domSource = new DOMSource(doc);
+            StringWriter writer = new StringWriter();
+            StreamResult result = new StreamResult(writer);
+            TransformerFactory tf = TransformerFactory.newInstance();
+            Transformer transformer = tf.newTransformer();
+            transformer.transform(domSource, result);
+            System.out.println(writer.toString());
+        } catch(TransformerException ex) {
+            ex.printStackTrace();
+        }
+    }
+
 }