Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update google #2229

Merged
merged 2 commits into from
Jul 26, 2024
Merged

Update google #2229

merged 2 commits into from
Jul 26, 2024

Conversation

rootmelo92118
Copy link
Collaborator

fix #2228

@rootmelo92118 rootmelo92118 requested a review from IceCodeNew July 8, 2024 04:47
@him007
Copy link
Contributor

him007 commented Jul 8, 2024

您好,不止是这两个需要修改。
我的意思是来自上游 https://github.com/felixonmars/dnsmasq-china-list/blob/master/google.china.conf 的数据都需要去掉full: ,google.china.conf 用的是 dnsmasq 格式,会匹配到子域名。

@IceCodeNew IceCodeNew marked this pull request as draft July 9, 2024 15:06
@IceCodeNew
Copy link
Collaborator

I may not be able to review this PR before this weekend, marking it as draft.

@Barry-SH
Copy link
Contributor

@him007
请教一个问题。
对于 google.china.conf,只有 "www." 开始的域名才算是完整域名吧! 比如 www.destinationurl.com
如果不是"www." 开始的都应该是匹配到子域名

如果是我理解的这样,我用python脚本处理了一下 google.china.conf

import re

with open('/tmp/google.china.conf', 'r', encoding='utf-8') as file:
    full_domain_name_list = []
    lines = file.readlines()
    for line in lines:
        line_pattern = r'^server='
        if re.match(line_pattern, line):
            server_info = line.split(r'/')
            full_domain_name_pattern = r'^www\.'
            if re.match(full_domain_name_pattern, server_info[1]):
                # Full domain name
                full_domain_name_list.append("full:" + server_info[1].strip() + " @cn")
            else:
                print(f"{server_info[1]} @cn")
    
    # Output full domain name
    print('\n'.join(full_domain_name_list))

结果如下,所以这些都要替换

265.com @cn
2mdn-cn.net @cn
2mdn.net @cn
admob-cn.com @cn
adservice.google.com @cn
ai.ytimg.com @cn
app-measurement-cn.com @cn
app-measurement.com @cn
apps5.oingo.com @cn
avail.googleflights.net @cn
beacons.gcp.gvt2.com @cn
beacons.gvt2.com @cn
beacons2.gvt2.com @cn
beacons3.gvt2.com @cn
borgmon.adz.google.com @cn
c.admob.com @cn
c.android.clients.google.com @cn
cache-management-prod.google.com @cn
cache.pack.google.com @cn
checkin.gstatic.com @cn
clickserve.cc-dt.com @cn
clickserve.dartsearch.net @cn
clickserver.googleads.com @cn
clientservices.googleapis.com @cn
cn.widevine.com @cn
cnappinstall.googleadapis.com @cn
connectivitycheck.gstatic.com @cn
content.googleadapis.com @cn
crashlyticsreports-pa.googleapis.com @cn
crl.pki.goog @cn
csi.gstatic.com @cn
dartsearch-cn.net @cn
dg-meta.video.google.com @cn
distribution.qatp1.net @cn
distribution.qcpp1.net @cn
distribution.qpdp1.net @cn
dl.google.com @cn
dl.l.google.com @cn
doubleclick-cn.net @cn
doubleclick.net @cn
download.mlcc.google.com @cn
download.qatp1.net @cn
download.qcpp1.net @cn
download.qpdp1.net @cn
download.tensorflow.google.com @cn
emmapplecodevice.googleapis.com @cn
firebase-settings.crashlytics.com @cn
fontfiles.googleadapis.com @cn
fontfiles.googleapis.com @cn
fonts.googleadapis.com @cn
fonts.googleapis.com @cn
fonts.gstatic.com @cn
g0.gstatic.com @cn
g1.gstatic.com @cn
g2.gstatic.com @cn
g3.gstatic.com @cn
gonglchuangl.net @cn
gongyichuangyi.net @cn
google-analytics-cn.com @cn
google-analytics.com @cn
googleadservices-cn.com @cn
googleadservices.com @cn
googleanalytics.com @cn
googleapis-cn.com @cn
googleapps-cn.com @cn
googleflights-cn.net @cn
googleoptimize-cn.com @cn
googleoptimize.com @cn
googleplex.com @cn
googlesyndication-cn.com @cn
googlesyndication.com @cn
googletagmanager-cn.com @cn
googletagmanager.com @cn
googletagservices-cn.com @cn
googletagservices.com @cn
googletraveladservices-cn.com @cn
googletraveladservices.com @cn
googlevads-cn.com @cn
goto.google.com @cn
gstatic-cn.com @cn
gstaticadssl.l.google.com @cn
gtm.oasisfeng.com @cn
gvt1-cn.com @cn
gvt2-cn.com @cn
imasdk.googleapis.com @cn
monitoring.qatp1.net @cn
monitoring.qcpp1.net @cn
monitoring.qpdp1.net @cn
ocsp.pki.goog @cn
pagead-googlehosted.l.google.com @cn
performanceparameters.googleapis.com @cn
pki-goog.l.google.com @cn
play.1ucrs.com @cn
prod-controlbe.floonet.goog @cn
prod-databe.floonet.goog @cn
prod.databe.floonet.goog @cn
qagpublic.qatp1.net @cn
qagpublic.qcpp1.net @cn
qagpublic.qpdp1.net @cn
qgadmin.qatp1.net @cn
qgadmin.qcpp1.net @cn
qgadmin.qpdp1.net @cn
qpx.googleflights.net @cn
qualysapi.qatp1.net @cn
qualysapi.qcpp1.net @cn
qualysapi.qpdp1.net @cn
qualysguard.qatp1.net @cn
qualysguard.qcpp1.net @cn
qualysguard.qpdp1.net @cn
recaptcha.net @cn
recaptcha-cn.net @cn
redirector.bdn.dev @cn
redirector.c.chat.google.com @cn
redirector.c.mail.google.com @cn
redirector.c.pack.google.com @cn
redirector.c.play.google.com @cn
redirector.c.youtubeeducation.com @cn
redirector.gcpcdn.gvt1.com @cn
redirector.gvt1.com @cn
redirector.offline-maps.gvt1.com @cn
redirector.snap.gvt1.com @cn
redirector.xn--ngstr-lra8j.com @cn
regioninfo-pa.googleapis.com @cn
safebrowsing.googleapis.com @cn
scanservice1.qatp1.net @cn
scanservice1.qcpp1.net @cn
scanservice1.qpdp1.net @cn
service.urchin.com @cn
settings.xn--9trs65b.com @cn
ssl-google-analytics.l.google.com @cn
ssl.gstatic.com @cn
staging-controlbe.floonet.goog @cn
staging-databe.floonet.goog @cn
staging-regioninfo-pa.googleapis.com @cn
staging.databe.floonet.goog @cn
support.1ucrs.com @cn
tac.googleapis.com @cn
test.bugs-qa.chromium.org @cn
test.gbugs-qa.chromium.org @cn
tools.google.com @cn
tools.l.google.com @cn
update.crashlytics.com @cn
update.googleapis.com @cn
wear.googleapis.com @cn
www-google-analytics.l.google.com @cn
www-googletagmanager.l.google.com @cn
xn--9kr7l.com @cn
xn--flw351e.com @cn
applemdm.corp.google.com @cn
dns.corp.google.com @cn
g3doc.corp.google.com @cn
gmskiosk-ssl.corp.google.com @cn
go.corp.google.com @cn
gorom.corp.google.com @cn
goto.corp.google.com @cn
l2-uberproxy.corp.google.com @cn
logger.corp.google.com @cn
logger-dev.corp.google.com @cn
login.corp.google.com @cn
proxyconfig.corp.google.com @cn
rapture-autopush.corp.google.com @cn
rapture.corp.google.com @cn
rapture-prod.corp.google.com @cn
rapture-test.corp.google.com @cn
r.cert.corp.google.com @cn
ssh-relay.corp.google.com @cn
sslredirect.corp.google.com @cn
streaming-uberproxy.corp.google.com @cn
streaming-uberproxy-rotation.corp.google.com @cn
sup.corp.google.com @cn
supportcenter.corp.google.com @cn
sup-ssh-relay2.corp.google.com @cn
sup-ssh-relay.corp.google.com @cn
techstop.corp.google.com @cn
uberproxy4.corp.google.com @cn
uberproxy6.corp.google.com @cn
uberproxy.corp.google.com @cn
uberproxy-debug4.corp.google.com @cn
uberproxy-debug.corp.google.com @cn
uberproxy-pen-redirect.corp.google.com @cn
vext.corp.google.com @cn
sup.l.google.com @cn
uberproxy-with-cn.l.google.com @cn
uberproxy-with-cn4.l.google.com @cn
uberproxy-with-cn6.l.google.com @cn
qiao-cn.com @cn
full:www.destinationurl.com @cn
full:www.googleadapis.com @cn
full:www.gstatic.com @cn
full:www.pxcc.com @cn

@Barry-SH Barry-SH mentioned this pull request Jul 22, 2024
@IceCodeNew IceCodeNew marked this pull request as ready for review July 26, 2024 14:52
@IceCodeNew
Copy link
Collaborator

这个 PR 的改动很小,而且可以肯定这两个域名应该要走子域名匹配。先合并

@IceCodeNew IceCodeNew merged commit 737fe37 into master Jul 26, 2024
1 check passed
@IceCodeNew IceCodeNew deleted the rootmelo92118-patch-3 branch July 26, 2024 14:53
github-actions bot added a commit to YW5vbnltb3Vz/domain-list-community that referenced this pull request Jul 26, 2024
* https://github.com/v2fly/domain-list-community:
  Update cnet (v2fly#2257)
  Update google (v2fly#2229)
  Update sony (v2fly#2250)
  add codeberg (v2fly#2254)
  Update google (v2fly#2262)
  Update (v2fly#2241)
  Update purikonejp (v2fly#2248)
  Update aws & aws-cn (v2fly#2267)
  add wistia to geolocation-!cn (v2fly#2245)
  Add Haier (v2fly#2244)
  Create `category-ru` (v2fly#2242)
  Add kucoin.com (v2fly#2226)
  Add more ntp servers (v2fly#2243)
  Update category-porn (v2fly#2261)
  Add yuanbei & Update geo-cn (v2fly#2240)
Lsyx-Good pushed a commit to Lsyx-Good/domain-list-community that referenced this pull request Aug 7, 2024
* Update google

fix v2fly#2228

* Update google

---------

Co-authored-by: IceCodeNew <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

google@cn需要去掉full:
4 participants