Add fakeip filter

Author: bdbai

YtFlowApp/NewProfilePage.cpp

@@ -30,9 +30,11 @@ namespace winrt::YtFlowApp::implementation
         hstring RuleResolver;
         hstring OutboundType;
         std::string CustomRules;
+        std::string FakeIpFilter;
         std::vector<NewProfileConfigRuleset> Rulesets{};
     };
     void CreatePresetPlugins(uint32_t profileId, NewProfileConfig config);
+    std::vector<std::string_view> SplitLines(std::string_view sv);
 
     NewProfilePage::NewProfilePage()
     {
@@ -90,6 +92,7 @@ namespace winrt::YtFlowApp::implementation
                 .RuleResolver = RuleResolverComboBox().SelectedItem().as<ComboBoxItem>().Tag().as<hstring>(),
                 .OutboundType = m_selectedOutboundType,
                 .CustomRules = to_string(CustomRuleTextBox().Text()),
+                .FakeIpFilter = to_string(FakeIpFilterTextBox().Text()),
                 .Rulesets =
                     std::views::transform(
                         RulesetListView().Items(),
@@ -314,7 +317,6 @@ namespace winrt::YtFlowApp::implementation
     void CreatePresetPlugins(uint32_t profileId, NewProfileConfig config)
     {
         using namespace std::string_literals;
-        using namespace std::string_view_literals;
         try
         {
             auto doc = NewProfilePage::GenPresetDoc();
@@ -407,19 +409,20 @@ namespace winrt::YtFlowApp::implementation
                 {"plugin_version", 0},
                 {"param",
                  {{"resolver", ruleResolver},
-                  {"source",
-                   {{"format", "quanx-filter"},
-                    {"text", std::views::split(std::string_view(config.CustomRules), "\r"sv) |
-                                 std::views::transform([](auto const sr) {
-                                     std::string_view const sv(sr);
-                                     auto const rpos = sv.find_last_not_of('\r');
-                                     return sv.substr(0, rpos == std::string_view::npos ? sv.size() : rpos + 1);
-                                 }) |
-                                 std::ranges::to<std::vector>()}}},
+                  {"source", {{"format", "quanx-filter"}, {"text", SplitLines(config.CustomRules)}}},
                   {"actions", availableActions()},
                   {"rules", {{"proxy", "proxy"}, {"direct", "direct"}, {"reject", "reject"}, {"next", "next"}}},
-                  {"fallback", makeAction(SplitRoutingRuleDecision::Next)}}}};
+                  {"fallback", makeAction(SplitRoutingRuleDecision::Next)}}}},
+                fakeipFilterDoc{
+                    {"desc", "Generate real IP addresses instead of Fake IPs for specified domain names."},
+                    {"plugin", "list-dispatcher"},
+                    {"plugin_version", 0},
+                    {"param",
+                     {{"source", {{"format", "surge-domain-set"}, {"text", SplitLines(config.FakeIpFilter)}}},
+                      {"action", {{"resolver", "phy.resolver"}}},
+                      {"fallback", {{"resolver", "fake-ip.resolver"}}}}}};
             doc["custom-rule-dispatcher"] = std::move(customRuleDoc);
+            doc["fakeip-filter"] = std::move(fakeipFilterDoc);
 
             // Adjust outbound
             if (config.OutboundType == L"ss")
@@ -542,4 +545,15 @@ namespace winrt::YtFlowApp::implementation
             L"ip6-cidr, 2001:4860:4860::8800/120, proxy, no-resolve\r\n");
         CustomRuleTextBox().Visibility(Visibility::Visible);
     }
+
+    std::vector<std::string_view> SplitLines(std::string_view sv)
+    {
+        using namespace std::string_view_literals;
+        return std::views::split(std::string_view(sv), "\r"sv) | std::views::transform([](auto const sr) {
+                   std::string_view const sv(sr);
+                   auto const rpos = sv.find_last_not_of('\r');
+                   return sv.substr(0, rpos == std::string_view::npos ? sv.size() : rpos + 1);
+               }) |
+               std::ranges::to<std::vector>();
+    }
 }

YtFlowApp/NewProfilePage.xaml

@@ -62,15 +62,39 @@
                     <RadioButton Tag="fake">UWP VPN, Fake IP range</RadioButton>
                     <RadioButton Tag="full">UWP VPN, Full IP range</RadioButton>
                 </muxc:RadioButtons>
-                <TextBlock Margin="{StaticResource SubheaderMargin}" Style="{ThemeResource BaseTextBlockStyle}">
+
+                <muxc:Expander
+                    HorizontalAlignment="Stretch"
+                    HorizontalContentAlignment="Stretch"
+                    Padding="0"
+                    Margin="0, 8, 0, 0"
+                >
+                    <muxc:Expander.Header>
+                        <TextBlock Style="{ThemeResource BaseTextBlockStyle}">
+                            Exclude domains from Fake IP
+                        </TextBlock>
+                    </muxc:Expander.Header>
+                    <TextBox
+                        x:Name="FakeIpFilterTextBox"
+                        Height="250"
+                        AcceptsReturn="True"
+                        TextWrapping="Wrap"
+                        IsSpellCheckEnabled="False"
+                        Text=".msftconnecttest.com&#13;.msftncsi.com&#13;.lan&#13;localhost.ptlogin2.qq.com"
+                    ></TextBox>
+                </muxc:Expander>
+
+
+                <!-- Inbound connections from localhost will be blocked by sandbox. No plan for now. -->
+                <!-- TextBlock Margin="{StaticResource SubheaderMargin}" Style="{ThemeResource BaseTextBlockStyle}">
                     Additional Inbound ports
                 </TextBlock>
                 <CheckBox IsEnabled="False">
                     <StackPanel Orientation="Horizontal" VerticalAlignment="Stretch">
                         <TextBlock VerticalAlignment="Center" Margin="0, 0, 10, 0">SOCKS5</TextBlock>
                         <TextBox PlaceholderText="Port" Text="9080" InputScope="Number" MaxLength="5" />
                     </StackPanel>
-                </CheckBox>
+                </CheckBox -->
             </StackPanel>
 
             <StackPanel x:Name="MiddlePanel" Grid.Row="2" Grid.Column="0">
@@ -186,6 +210,7 @@
                             AcceptsReturn="True"
                             Visibility="Collapsed"
                             TextWrapping="Wrap"
+                            IsSpellCheckEnabled="False"
                         ></TextBox>
                         <TextBlock
                             Margin="24, 8, 24, 16"
@@ -287,7 +312,7 @@
                         <Setter Target="MiddlePanel.(Grid.Column)" Value="1" />
                         <Setter Target="MiddlePanel.(Grid.Row)" Value="1" />
                         <Setter Target="MiddlePanel.(Grid.RowSpan)" Value="3" />
-                        <Setter Target="RightPanel.Margin" Value="8, 0, 0, 0" />
+                        <Setter Target="MiddlePanel.Margin" Value="12, 0, 12, 0" />
                         <Setter Target="RightPanel.(Grid.Column)" Value="2" />
                         <Setter Target="RightPanel.(Grid.Row)" Value="1" />
                         <Setter Target="RightPanel.(Grid.RowSpan)" Value="3" />

YtFlowApp/NewProfilePagePresets.cpp

@@ -242,7 +242,7 @@ namespace winrt::YtFlowApp::implementation
                  {"plugin_version", 0},
                  {"param",
                   {{"concurrency_limit", 64},
-                   {"resolver", "fake-ip.resolver"},
+                   {"resolver", "fakeip-filter.resolver"},
                    {"tcp_map_back", {"udp-proxy-switch.tcp"}},
                    {"udp_map_back", {"udp-proxy-switch.udp"}},
                    {"ttl", 60}}}},