add screenshots; update README.md

README.md

@@ -6,6 +6,12 @@ Deep WIP multi-tool to work with NS-specific files / filesystem images.
 
 [GNU General Public License v3+](https://github.com/developersu/konogonka/blob/master/LICENSE)
 
+<img src="screenshots/1.png" alt="drawing" width="250"/> <img src="screenshots/2.png" alt="drawing" width="250"/> <img src="screenshots/3.png" alt="drawing" width="250"/>
+
+<img src="screenshots/4.png" alt="drawing" width="250"/> <img src="screenshots/5.png" alt="drawing" width="250"/> <img src="screenshots/6.png" alt="drawing" width="250"/>
+
+<img src="screenshots/7.png" alt="drawing" width="250"/>
+
 ### Used libraries & resources
 * [Bouncy Castle](https://www.bouncycastle.org/) for Java.
 * [Java-XTS-AES](https://github.com/horrorho/Java-XTS-AES) by horrorho with minimal changes.
@@ -45,6 +51,6 @@ JRE/JDK 8u60 or higher.
 * [ ] CERT support
 * [ ] CNMT support
 * [ ] NSO support
-* [ ] RomFS deep-dive
+* [x] RomFS
 * [ ] LogPrinter to singleton implementation. 
 * [x] 'Save to folder' option

src/main/java/konogonka/Controllers/MainController.java

@@ -110,7 +110,7 @@ public class MainController implements Initializable {
             fileChooser.setInitialDirectory(new File(System.getProperty("user.home")));
 
         fileChooser.getExtensionFilters().add(new FileChooser.ExtensionFilter("NS files",
-                "*.nsp", "*.nsz", "*.xci", "*.nca", "*.tik", "*.xml", "*.npdm", "*.romfs"));
+                "*.nsp", "*.nsz", "*.xci", "*.nca", "*.tik", "*.xml", "*.npdm", "*.bin"));
 
         this.selectedFile = fileChooser.showOpenDialog(analyzeBtn.getScene().getWindow());
 
@@ -156,7 +156,7 @@ public class MainController implements Initializable {
             case "npdm":
                 tabPane.getSelectionModel().select(5);
                 break;
-            case "romfs":
+            case "bin":
                 tabPane.getSelectionModel().select(6);
         }
     }
@@ -185,7 +185,7 @@ public class MainController implements Initializable {
             case "npdm":
                 NPDMTabController.analyze(selectedFile);
                 break;
-            case "romfs":
+            case "bin":
                 RFSTabController.analyze(selectedFile);
         }
     }
@@ -198,7 +198,7 @@ public class MainController implements Initializable {
             case "tik":
             case "xml":
             case "npdm":
-            case "romfs":
+            case "bin":
                 return false;
             default:
                 return true;

src/main/java/konogonka/Controllers/RFS/RomFsController.java

@@ -147,7 +147,15 @@ public class RomFsController implements ITabController {
 
     @Override
     public void analyze(File file) {
-        Task<RomFsDecryptedProvider> analyzer = Analyzer.analyzeRomFS(file);
+        long lv6offset = -1;
+        try{
+            System.out.println(file.getName().replaceAll("(^.*lv6\\s)|(]\\.bin)", ""));
+            lv6offset = Long.parseLong(file.getName().replaceAll("(^.*lv6\\s)|(]\\.bin)", ""));
+        }
+        catch (Exception e){
+            e.printStackTrace();
+        }
+        Task<RomFsDecryptedProvider> analyzer = Analyzer.analyzeRomFS(file, lv6offset);
         analyzer.setOnSucceeded(e->{
             RomFsDecryptedProvider provider = analyzer.getValue();
             this.setData(provider);

src/main/java/konogonka/Tools/RomFs/IRomFsProvider.java

@@ -23,6 +23,7 @@ import java.io.File;
 import java.io.PipedInputStream;
 
 public interface IRomFsProvider {
+    long getLevel6Offset();
     Level6Header getHeader();
     FileSystemEntry getRootEntry();
     PipedInputStream getContent(FileSystemEntry entry) throws Exception;

src/main/java/konogonka/Tools/RomFs/RomFsDecryptedProvider.java

@@ -23,20 +23,24 @@ import java.io.*;
 
 public class RomFsDecryptedProvider implements IRomFsProvider{
 
-    private static final long LEVEL_6_DEFAULT_OFFSET = 0x14000; // TODO: FIX incorrect
+    private long level6Offset;
 
     private File file;
     private Level6Header header;
 
     private FileSystemEntry rootEntry;
-    // TODO: FIX. LEVEL 6 OFFSET MUST be provided
 
-    public RomFsDecryptedProvider(File decryptedFsImageFile) throws Exception{     // TODO: add default setup AND using meta-data headers from NCA RomFs section (?)
+    public RomFsDecryptedProvider(File decryptedFsImageFile, long level6Offset) throws Exception{
+        if (level6Offset < 0)
+            throw new Exception("Incorrect Level 6 Offset");
+
         this.file = decryptedFsImageFile;
 
         BufferedInputStream bis = new BufferedInputStream(new FileInputStream(decryptedFsImageFile));
 
-        skipBytes(bis, LEVEL_6_DEFAULT_OFFSET);
+        this.level6Offset = level6Offset;
+
+        skipBytes(bis, level6Offset);
 
         byte[] rawDataChunk = new byte[0x50];
 
@@ -98,6 +102,8 @@ public class RomFsDecryptedProvider implements IRomFsProvider{
         }
     }
     @Override
+    public long getLevel6Offset() { return level6Offset; }
+    @Override
     public Level6Header getHeader() { return header; }
     @Override
     public FileSystemEntry getRootEntry() { return rootEntry; }
@@ -114,7 +120,7 @@ public class RomFsDecryptedProvider implements IRomFsProvider{
         workerThread = new Thread(() -> {
             System.out.println("RomFsDecryptedProvider -> getContent(): Executing thread");
             try {
-                long subFileRealPosition = LEVEL_6_DEFAULT_OFFSET + header.getFileDataOffset() + entry.getFileOffset();
+                long subFileRealPosition = level6Offset + header.getFileDataOffset() + entry.getFileOffset();
                 BufferedInputStream bis = new BufferedInputStream(new FileInputStream(file));
                 skipBytes(bis, subFileRealPosition);
 

src/main/java/konogonka/Tools/RomFs/RomFsEncryptedProvider.java

@@ -26,7 +26,7 @@ import java.util.Arrays;
 
 public class RomFsEncryptedProvider implements IRomFsProvider{
 
-    private static long level6Offset;
+    private long level6Offset;
 
     private File file;
     private Level6Header header;
@@ -176,6 +176,8 @@ public class RomFsEncryptedProvider implements IRomFsProvider{
         return metadataTable;
     }
 
+    @Override
+    public long getLevel6Offset() { return level6Offset; }
     @Override
     public Level6Header getHeader() { return header; }
     @Override
@@ -189,33 +191,80 @@ public class RomFsEncryptedProvider implements IRomFsProvider{
         Thread workerThread;
 
         PipedInputStream streamIn = new PipedInputStream(streamOut);
-
         workerThread = new Thread(() -> {
             System.out.println("RomFsDecryptedProvider -> getContent(): Executing thread");
             try {
-                long subFileRealPosition = level6Offset + header.getFileDataOffset() + entry.getFileOffset();
-                BufferedInputStream bis = new BufferedInputStream(new FileInputStream(file));
-                bis.skip(subFileRealPosition);
 
-                int readPice = 8388608; // 8mb NOTE: consider switching to 1mb 1048576
+                byte[] encryptedBlock;
+                byte[] dectyptedBlock;
 
-                long readFrom = 0;
+                RandomAccessFile raf = new RandomAccessFile(file, "r");
-                long realFileSize = entry.getFileSize();
 
-                byte[] readBuf;
+                //0
+                AesCtrDecryptSimple decryptor = new AesCtrDecryptSimple(key, sectionCTR, mediaStartOffset * 0x200);
 
-                while (readFrom < realFileSize) {
+                long startBlock = (entry.getFileOffset() + header.getFileDataOffset()) / 0x200;
-                    if (realFileSize - readFrom < readPice)
+
-                        readPice = Math.toIntExact(realFileSize - readFrom);    // it's safe, I guarantee
+                decryptor.skipNext(level6Offset / 0x200 + startBlock);
-                    readBuf = new byte[readPice];
+
-                    if (bis.read(readBuf) != readPice) {
+                long abosluteOffsetPosition = romFSoffsetPosition + (mediaStartOffset * 0x200);
-                        System.out.println("RomFsDecryptedProvider -> getContent(): Unable to read requested size from file.");
+
-                        return;
+                raf.seek(abosluteOffsetPosition + level6Offset + startBlock * 0x200);
+
+                //1
+                long ignoreBytes = (entry.getFileOffset() + header.getFileDataOffset()) - startBlock * 0x200;
+
+                if (ignoreBytes > 0) {
+                    encryptedBlock = new byte[0x200];
+                    if (raf.read(encryptedBlock) == 0x200) {
+                        dectyptedBlock = decryptor.dectyptNext(encryptedBlock);
+                        // If we have extra-small file that is less then a block and even more
+                        if ((0x200 - ignoreBytes) > entry.getFileSize()){
+                            streamOut.write(dectyptedBlock, (int)ignoreBytes, (int) entry.getFileSize());    // safe cast
+                            raf.close();
+                            streamOut.close();
+                            return;
+                        }
+                        else {
+                            streamOut.write(dectyptedBlock, (int) ignoreBytes, 0x200 - (int) ignoreBytes);
+                        }
                     }
-                    streamOut.write(readBuf);
+                    else {
-                    readFrom += readPice;
+                        throw new Exception("RomFsEncryptedProvider(): Unable to get 512 bytes from 1st bock for Directory Metadata Table");
+                    }
+                    startBlock++;
                 }
-                bis.close();
+                long endBlock = (entry.getFileSize() + ignoreBytes) / 0x200 + startBlock;  // <- pointing to place where any data related to this media-block ends
+
+                //2
+                int extraData = (int) ((endBlock - startBlock)*0x200 - (entry.getFileSize() + ignoreBytes));
+
+                if (extraData < 0)
+                    endBlock--;
+                //3
+                while ( startBlock < endBlock ) {
+                    encryptedBlock = new byte[0x200];
+                    if (raf.read(encryptedBlock) == 0x200) {
+                        dectyptedBlock = decryptor.dectyptNext(encryptedBlock);
+                        streamOut.write(dectyptedBlock);
+                    }
+                    else
+                        throw new Exception("RomFsEncryptedProvider(): Unable to get 512 bytes from block for Directory Metadata Table");
+
+                    startBlock++;
+                }
+
+                //4
+                if (extraData != 0){                 // In case we didn't get what we want
+                    encryptedBlock = new byte[0x200];
+                    if (raf.read(encryptedBlock) == 0x200) {
+                        dectyptedBlock = decryptor.dectyptNext(encryptedBlock);
+                        streamOut.write(dectyptedBlock, 0, Math.abs(extraData));
+                    }
+                    else
+                        throw new Exception("RomFsEncryptedProvider(): Unable to get 512 bytes from block for Directory Metadata Table");
+                }
+                raf.close();
                 streamOut.close();
             } catch (Exception e) {
                 System.out.println("RomFsDecryptedProvider -> getContent(): Unable to provide stream");
@@ -226,6 +275,7 @@ public class RomFsEncryptedProvider implements IRomFsProvider{
         workerThread.start();
         return streamIn;
     }
+
     @Override
     public File getFile() {
         return file;

src/main/java/konogonka/Workers/Analyzer.java

@@ -161,14 +161,14 @@ public class Analyzer {
         };
     }
 
-    public static Task<RomFsDecryptedProvider> analyzeRomFS(File file){
+    public static Task<RomFsDecryptedProvider> analyzeRomFS(File file, long lv6offset){
         LogPrinter logPrinter = new LogPrinter();
         return new Task<RomFsDecryptedProvider>() {
             @Override
             protected RomFsDecryptedProvider call() {
                 logPrinter.print("\tStart chain: RomFS", EMsgType.INFO);
                 try {
-                    return new RomFsDecryptedProvider(file);
+                    return new RomFsDecryptedProvider(file, lv6offset);
                 } catch (Exception e) {
                     logPrinter.print(e.getMessage(), EMsgType.FAIL);
                     return null;

src/main/java/konogonka/Workers/DumbNCA3ContentExtractor.java

@@ -26,8 +26,12 @@ public class DumbNCA3ContentExtractor extends Task<Void> {
 
     @Override
     protected Void call() {
-        logPrinter.print("\tStart dummy extracting: \n"+filesDestPath+"NCAContent_"+ncaNumberInFile+".bin", EMsgType.INFO);
+        String lv6mark = "";
-        File contentFile = new File(filesDestPath + "NCAContent_"+ncaNumberInFile+".bin");
+        if (ncaContent.getRomfs() != null){
+            lv6mark = " [lv6 "+ncaContent.getRomfs().getLevel6Offset()+"]";
+        }
+        logPrinter.print("\tStart dummy extracting: \n"+filesDestPath+"NCAContent_"+ncaNumberInFile+lv6mark+".bin", EMsgType.INFO);
+        File contentFile = new File(filesDestPath + "NCAContent_"+ncaNumberInFile+lv6mark+".bin");
         try {
             BufferedOutputStream extractedFileBOS = new BufferedOutputStream(new FileOutputStream(contentFile));
             PipedInputStream pis = ncaContent.getRawDataContentPipedInpStream();

src/main/resources/FXML/RomFS/RFSTab.fxml

@@ -15,7 +15,7 @@
 <?import javafx.scene.shape.SVGPath?>
 <?import javafx.scene.text.Font?>
 
-<VBox minHeight="600.0" spacing="5.0" xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1" fx:controller="konogonka.Controllers.RFS.RomFsController">
+<VBox minHeight="750.0" spacing="5.0" xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1" fx:controller="konogonka.Controllers.RFS.RomFsController">
    <children>
       <TitledPane animated="false" expanded="false" text="Header (Level 6)">
          <content>