fix: auto-disable XDP for non-conforming apps #1664
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| /* | ||
| * SPDX-FileCopyrightText: 2026 UnionTech Software Technology Co., Ltd. | ||
| * | ||
| * SPDX-License-Identifier: LGPL-3.0-or-later | ||
| */ | ||
|
|
||
| #include <gtest/gtest.h> | ||
|
|
||
| #include "linglong/utils/xdp.h" | ||
|
|
||
| using namespace linglong::utils; | ||
|
|
||
| TEST(IsValidXdgDesktopPortalIdTest, ValidStandardId) | ||
| { | ||
| EXPECT_TRUE(isValidXdgDesktopPortalId("org.example.app")); | ||
| EXPECT_TRUE(isValidXdgDesktopPortalId("com.deepin.calculator")); | ||
| EXPECT_TRUE(isValidXdgDesktopPortalId("org.freedesktop.portal")); | ||
| } | ||
|
|
||
| TEST(IsValidXdgDesktopPortalIdTest, ValidWithHyphenInLastSegment) | ||
| { | ||
| EXPECT_TRUE(isValidXdgDesktopPortalId("org.example.my-app")); | ||
| EXPECT_TRUE(isValidXdgDesktopPortalId("com.deepin.app-launcher")); | ||
| } | ||
|
|
||
| TEST(IsValidXdgDesktopPortalIdTest, ValidWithUnderscore) | ||
| { | ||
| EXPECT_TRUE(isValidXdgDesktopPortalId("org.example_my.app")); | ||
| EXPECT_TRUE(isValidXdgDesktopPortalId("com.deepin.my_app")); | ||
| } | ||
|
|
||
| TEST(IsValidXdgDesktopPortalIdTest, ValidWithDigits) | ||
| { | ||
| EXPECT_TRUE(isValidXdgDesktopPortalId("org.example.app2")); | ||
| EXPECT_TRUE(isValidXdgDesktopPortalId("org.2example.app")); | ||
| } | ||
|
|
||
| TEST(IsValidXdgDesktopPortalIdTest, ValidMultiSegment) | ||
| { | ||
| EXPECT_TRUE(isValidXdgDesktopPortalId("org.deepin.linglong.app")); | ||
| EXPECT_TRUE(isValidXdgDesktopPortalId("a.b.c.d.e")); | ||
| } | ||
|
|
||
| TEST(IsValidXdgDesktopPortalIdTest, InvalidSingleSegment) | ||
| { | ||
| EXPECT_FALSE(isValidXdgDesktopPortalId("single")); | ||
| EXPECT_FALSE(isValidXdgDesktopPortalId("app")); | ||
| } | ||
|
|
||
| TEST(IsValidXdgDesktopPortalIdTest, InvalidEmptyString) | ||
| { | ||
| EXPECT_FALSE(isValidXdgDesktopPortalId("")); | ||
| } | ||
|
|
||
| TEST(IsValidXdgDesktopPortalIdTest, InvalidHyphenInNonLastSegment) | ||
| { | ||
| EXPECT_FALSE(isValidXdgDesktopPortalId("org.my-app.app")); | ||
| EXPECT_FALSE(isValidXdgDesktopPortalId("my-org.example.app")); | ||
| } | ||
|
|
||
| TEST(IsValidXdgDesktopPortalIdTest, InvalidEmptySegment) | ||
| { | ||
| EXPECT_FALSE(isValidXdgDesktopPortalId("org..app")); | ||
| EXPECT_FALSE(isValidXdgDesktopPortalId(".org.app")); | ||
| EXPECT_FALSE(isValidXdgDesktopPortalId("org.app.")); | ||
| } | ||
|
|
||
| TEST(IsValidXdgDesktopPortalIdTest, InvalidSpecialChars) | ||
| { | ||
| EXPECT_FALSE(isValidXdgDesktopPortalId("org.example.app!")); | ||
| EXPECT_FALSE(isValidXdgDesktopPortalId("org.example.app@home")); | ||
| EXPECT_FALSE(isValidXdgDesktopPortalId("org/example/app")); | ||
| } | ||
|
|
||
| TEST(IsValidXdgDesktopPortalIdTest, InvalidSlashInId) | ||
| { | ||
| EXPECT_FALSE(isValidXdgDesktopPortalId("org.deepin.calculator/stable")); | ||
| EXPECT_FALSE(isValidXdgDesktopPortalId("org/deepin/app")); | ||
| } | ||
|
|
||
| TEST(IsValidXdgDesktopPortalIdTest, InvalidHyphenInMultipleNonLastSegments) | ||
| { | ||
| EXPECT_FALSE(isValidXdgDesktopPortalId("my-org.my-app.app")); | ||
| } | ||
|
|
||
| TEST(IsValidXdgDesktopPortalIdTest, ValidHyphenOnlyInLastSegment) | ||
| { | ||
| EXPECT_TRUE(isValidXdgDesktopPortalId("org.example.a-b")); | ||
| EXPECT_TRUE(isValidXdgDesktopPortalId("org.example.a-b-c")); | ||
| } | ||
|
|
||
| TEST(IsValidXdgDesktopPortalIdTest, InvalidLastSegmentEmpty) | ||
| { | ||
| EXPECT_FALSE(isValidXdgDesktopPortalId("org.example.")); | ||
| } | ||
|
|
||
| TEST(IsValidXdgDesktopPortalIdTest, TwoSegmentsValid) | ||
| { | ||
| EXPECT_TRUE(isValidXdgDesktopPortalId("org.app")); | ||
| EXPECT_TRUE(isValidXdgDesktopPortalId("a.b")); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| /* | ||
| * SPDX-FileCopyrightText: 2026 UnionTech Software Technology Co., Ltd. | ||
| * | ||
| * SPDX-License-Identifier: LGPL-3.0-or-later | ||
| */ | ||
|
|
||
| #pragma once | ||
|
|
||
| #include <algorithm> | ||
| #include <cctype> | ||
| #include <string_view> | ||
| #include <vector> | ||
|
|
||
| namespace linglong::utils { | ||
|
|
||
| inline bool isValidXdgDesktopPortalId(std::string_view appid) noexcept | ||
| { | ||
| std::vector<std::string_view> segments; | ||
|
|
||
| size_t start = 0; | ||
| for (size_t i = 0; i < appid.size(); ++i) { | ||
| if (appid[i] == '.') { | ||
| segments.push_back(appid.substr(start, i - start)); | ||
| start = i + 1; | ||
| } | ||
| } | ||
| segments.push_back(appid.substr(start)); | ||
|
|
||
| if (segments.size() < 2) { | ||
| return false; | ||
| } | ||
|
|
||
| for (size_t i = 0; i + 1 < segments.size(); ++i) { | ||
| if (segments[i].empty()) { | ||
| return false; | ||
| } | ||
| if (!std::all_of(segments[i].begin(), segments[i].end(), [](char c) { | ||
| return std::isalnum(static_cast<unsigned char>(c)) || c == '_'; | ||
| })) { | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| const auto &last = segments.back(); | ||
| if (last.empty()) { | ||
| return false; | ||
| } | ||
| return std::all_of(last.begin(), last.end(), [](char c) { | ||
| return std::isalnum(static_cast<unsigned char>(c)) || c == '_' || c == '-'; | ||
| }); | ||
| } | ||
|
Comment on lines
+16
to
+51
Contributor
There was a problem hiding this comment. The current implementation of Additionally, Note: According to the D-Bus and Desktop Entry specifications, segments of a well-known name must not begin with a digit. The current implementation allows this (e.g., inline bool isValidXdgDesktopPortalId(std::string_view appid) noexcept
{
if (appid.empty()) {
return false;
}
size_t segmentCount = 0;
size_t start = 0;
for (size_t i = 0; i <= appid.size(); ++i) {
if (i == appid.size() || appid[i] == '.') {
std::string_view segment = appid.substr(start, i - start);
if (segment.empty()) {
return false;
}
bool isLast = (i == appid.size());
for (char c : segment) {
bool ok = (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || (c == '_');
if (isLast && c == '-') {
ok = true;
}
if (!ok) {
return false;
}
}
segmentCount++;
start = i + 1;
}
}
return segmentCount >= 2;
} |
||
|
|
||
| } // namespace linglong::utils | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If the optimized implementation of
isValidXdgDesktopPortalId(suggested below) is adopted, the<algorithm>,<cctype>, and<vector>headers are no longer necessary, and only<string_view>is required.