Initial commit didn't contain latest changes

Author: TheAssassin

src/desktopfilereader.cpp

@@ -98,9 +98,29 @@ namespace linuxdeploy {
                                             (c >= 'A' && c <= 'Z') ||
                                             (c >= 'a' && c <= 'z') ||
                                             (c >= '0' && c <= '9') ||
-                                            (c == '-')
-                                        ))
-                                        throw ParseError("Key contains invalid character " + std::string{c});
+                                            (c == '-') ||
+                                            // FIXME: remove this hack after introducing localization support to
+                                            // conform to desktop file spec again
+                                            (c == '[') || (c == ']')
+                                        )
+                                    ) {
+                                        throw ParseError(
+                                        "Key " + key + " contains invalid character " + std::string{c}
+                                        );
+                                    }
+                                }
+
+                                if (std::count(key.begin(), key.end(), '[') > 1 ||
+                                    std::count(key.begin(), key.end(), ']') > 1 ||
+                                    // make sure that both [ and ] are present
+                                    (key.find('[') != std::string::npos && key.find(']') == std::string::npos) ||
+                                    (key.find('[') == std::string::npos && key.find(']') != std::string::npos) ||
+                                    // disallow empty locale names
+                                    (key.find('[') != std::string::npos && key.find(']') != std::string::npos && (key.find(']') - key.find('[')) < 2) ||
+                                    // ensure order of [ and ]
+                                    (key.find('[') != std::string::npos && key.find('[' ) > key.find(']'))
+                                ) {
+                                    throw ParseError("Invalid localization syntax used in key " + key);
                                 }
 
                                 auto& section = sections[currentSectionName];

tests/test_desktopfilereader.cpp

@@ -388,3 +388,78 @@ TEST_F(DesktopFileReaderTest, testReadBrokenSectionMissingOpeningBracket) {
         EXPECT_THROW(DesktopFileReader reader(ins), ParseError);
     }
 }
+
+// FIXME: introduce proper localization support
+TEST_F(DesktopFileReaderTest, testReadLocalizedEntriesWithoutProperLocalizationSupport) {
+    std::stringstream ss;
+    ss << "[Desktop File]" << std::endl
+       << "Name=name" << std::endl
+       << "Name[de]=name" << std::endl
+       << "Exec=exec" << std::endl;
+
+    DesktopFileReader reader(ss);
+
+    auto section = reader["Desktop File"];
+    EXPECT_FALSE(section.empty());
+
+    auto data = reader.data();
+
+    auto expected = DesktopFile::section_t({
+                                           {"Name", DesktopFileEntry("Name", "name")},
+                                           // FIXME: revise after introduction of localization support
+                                           {"Name[de]", DesktopFileEntry("Name[de]", "name")},
+                                           {"Exec", DesktopFileEntry("Exec", "exec")},
+                                           });
+
+    EXPECT_EQ(data["Desktop File"], expected);
+}
+
+TEST_F(DesktopFileReaderTest, testBrokenLocalizedKeys) {
+    {
+        std::stringstream ins;
+        ins << "[Desktop Entry]" << std::endl
+            << "test]de[=test" << std::endl;
+
+        EXPECT_THROW(DesktopFileReader reader(ins), ParseError);
+    }
+
+    {
+        std::stringstream ins;
+        ins << "[Desktop Entry]" << std::endl
+            << "test[de]]=test" << std::endl;
+
+        EXPECT_THROW(DesktopFileReader reader(ins), ParseError);
+    }
+
+    {
+        std::stringstream ins;
+        ins << "[Desktop Entry]" << std::endl
+            << "test[[de]=test" << std::endl;
+
+        EXPECT_THROW(DesktopFileReader reader(ins), ParseError);
+    }
+
+    {
+        std::stringstream ins;
+        ins << "[Desktop Entry]" << std::endl
+            << "test[]de=test" << std::endl;
+
+        EXPECT_THROW(DesktopFileReader reader(ins), ParseError);
+    }
+
+    {
+        std::stringstream ins;
+        ins << "[Desktop Entry]" << std::endl
+            << "test[de=test" << std::endl;
+
+        EXPECT_THROW(DesktopFileReader reader(ins), ParseError);
+    }
+
+    {
+        std::stringstream ins;
+        ins << "[Desktop Entry]" << std::endl
+            << "testde]=test" << std::endl;
+
+        EXPECT_THROW(DesktopFileReader reader(ins), ParseError);
+    }
+}