Skip to content
This repository was archived by the owner on Nov 6, 2023. It is now read-only.

add more hosts to swissgov.xml - #6771

Merged
jeremyn merged 17 commits into
EFForg:masterfrom
J0WI:swissgov
Apr 29, 2017
Merged

jeremyn merged 17 commits into
EFForg:masterfrom
J0WI:swissgov

Conversation

@J0WI

@J0WI J0WI commented Sep 6, 2016

Copy link
Copy Markdown
Contributor

No description provided.

@J0WI

J0WI commented Sep 6, 2016

Copy link
Copy Markdown
Contributor Author

I think the fetch errors here are false positives.

@jeremyn jeremyn closed this Sep 6, 2016
@jeremyn jeremyn reopened this Sep 6, 2016
@jeremyn

jeremyn commented Sep 6, 2016

Copy link
Copy Markdown
Contributor

I get Secure Connection Failed in Firefox with https://parlament.ch . https://www.elcom.admin.ch and https://www.parlament.ch work though. I've restarted the tests.

@J0WI

J0WI commented Sep 11, 2016

Copy link
Copy Markdown
Contributor Author

I commented the host out for now, so test are passing.

@J0WI J0WI closed this Sep 14, 2016
@J0WI J0WI reopened this Sep 14, 2016
@J0WI J0WI closed this Oct 3, 2016
@J0WI J0WI reopened this Oct 3, 2016
@J0WI

J0WI commented Feb 12, 2017

Copy link
Copy Markdown
Contributor Author

ping @jeremyn for a review

@jeremyn

jeremyn commented Mar 9, 2017 •

Copy link
Copy Markdown
Contributor

Checklist for Swiss_Federal_Institute_of_Intellectual_Property.xml:

Note as Refused:

Add target:

Also:

  • Fix misspelling: govnerment
  • Fix misspelling: ip-seacrh.ch
  • Add a note about how ige.ch, swissreg.ch, and ip-search.ch are related to each other, if that's easy to do.

Checklist for Swiss_Financial_Market_Supervisory_Authority.xml:


Checklist for dot.swiss.xml:

  • Delete all tests
  • Change ruleset name to dot.swiss
  • Fix misspelling: govnerment

Checklist for swissgov.xml

Top comment changes, read this as "URL, what I got, what comment says":

Add tests that don't get a 40x, if available:

Also:

  • http://rab-asr.ch redirects to www even though https://rab-asr.ch works too. If we want to match the site's behavior then we should also redirect ^ to www with a rule. What do you think? Okay (add more hosts to swissgov.xml #6771 (comment))
  • https://baselland.ch (and www) works for me in the browser and with fetch-test.sh, so you can add it back in (without the special rule).
  • Note ^be.ch as Invalid certificate and 404.
  • You don't need the redirect rule from ^gl.ch to www.gl.ch
  • I'm seeing MCB for https://gl.ch (and www), so you should remove the targets and note them in the top comment.
  • Note ^jura.ch as 404 different HTTP/HTTPS content.

@J0WI

J0WI commented Mar 16, 2017

Copy link
Copy Markdown
Contributor Author

^ip-search.ch does not exist.
I would like to keep the comments for first and webmail for now.

I addressed all other points.

@jeremyn

jeremyn commented Mar 18, 2017

Copy link
Copy Markdown
Contributor

Swiss_Federal_Institute_of_Intellectual_Property.xml is done.

Swiss_Financial_Market_Supervisory_Authority.xml is done except for a minor spelling problem that I've added to the checklist.

@jeremyn

jeremyn commented Mar 18, 2017

Copy link
Copy Markdown
Contributor

I've added dot.swiss.xml to the checklist.

@J0WI J0WI closed this Mar 18, 2017
@J0WI J0WI reopened this Mar 18, 2017
@jeremyn

jeremyn commented Mar 19, 2017

Copy link
Copy Markdown
Contributor

swissgov.xml really needs to be broken up and reformatted before I look at it more closely, sorry. I guess it's obvious what most of the problems are but I can elaborate if you need me to.

I recommend splitting the three approved rulesets into a new pull request, and then make new pull requests as you split stuff off of swissgov.xml. Maybe one PR for admin.ch and one for each canton, at least.

@J0WI

J0WI commented Mar 19, 2017

Copy link
Copy Markdown
Contributor Author

That would have been nice to know before you started to review...

@J0WI

J0WI commented Mar 19, 2017

Copy link
Copy Markdown
Contributor Author

It's not easy to just split this now in different PRs, because of the all the references.

Can we just merge the updates on *.admin.ch (and code stye) in swissgov.xml and then I will fill follow-up PRs for the other hosts and to split some hosts into new files?

@jeremyn

jeremyn commented Mar 19, 2017

Copy link
Copy Markdown
Contributor

I think it's okay to have unreturned references from the other files to swissgov.xml for now, if we merge those separately.

I'm not sure what to suggest for the swissgov.xml changes. It is very difficult to read. For example the top comment uses no certificate, self-signed, Mismatch, and the ¬ symbol to all mean Invalid certificate. I don't want to figure out what I'm testing with forty rows like:

	admin.ch:
		- rpvz.nb ¬
		- www.afd ²	

www.publica.ch is between www.webftp.admin.ch and www.wbf.admin.ch for some reason, and anyway www.wbf should come before www.webftp. There are triple indented targets. Etc, this is not a complete list of problems.

@J0WI

J0WI commented Mar 21, 2017

Copy link
Copy Markdown
Contributor Author

@jeremyn I rebased this branch and reorganized the comments.

Please review with the following notes in mind:

  • This adds some hosts to *.admin.ch
    • This is the only functional change in this PR
    • Maybe you can use some filters in git diff for a clearer view
  • This adds some additional comments and code style changes
  • canton hosts are not changed and may be spitted into multiple files and rebased in further PRs
    • However, some minor changes where necessary to fix tests

@J0WI

J0WI commented Apr 5, 2017

Copy link
Copy Markdown
Contributor Author

@jeremyn I would really like to continue here. Can you manage to spend some attention on this again?

@jeremyn

jeremyn commented Apr 6, 2017 •

Copy link
Copy Markdown
Contributor

I've updated the checklist through the 4ddaa99, and only through the top comment.

Please get rid of the nested targets. I don't know why you did it that way, or what it "means" to have a hierarchy of for example www.wbf.admin.ch > www.blw.admin.ch, or www.edi.admin.ch > www.bsv.admin.ch > www.regress.admin.ch. It also makes the diff harder to read.

@J0WI

J0WI commented Apr 9, 2017

Copy link
Copy Markdown
Contributor Author

Thanks for the feedback.

www.afd.admin.ch, incomplete certificate chain, different http/https

Well, this host has both issues, but the chain is just a minor thing.

www.bit.admin.ch, works correctly, redirect

Only http://www.bit.admin.ch/$ works, all other sites redirect to http. So I think it's not worth to add a rule.

<!-- hosts sorted by department -->

I think it's much easier to maintain this way. You can find each host in the breadcrumb in the same structure.

@J0WI J0WI closed this Apr 15, 2017
@J0WI J0WI reopened this Apr 15, 2017
@jeremyn

jeremyn commented Apr 27, 2017

Copy link
Copy Markdown
Contributor

I've updated the checklist through b6f52f7 and have otherwise finished reviewing.

@J0WI

J0WI commented Apr 28, 2017

Copy link
Copy Markdown
Contributor Author

I'm fine with redirecting rab-asr.ch.

@jeremyn

jeremyn commented Apr 28, 2017

Copy link
Copy Markdown
Contributor

I've updated the checklist through d82b291.

In your last comment, just to confirm, do you mean that you are okay with the way you have it now, where we rewrite http://rab-asr.ch to https://rab-asr.ch even though the site itself redirects http://rab-asr.ch to https://www.rab-asr.ch ?

@J0WI

J0WI commented Apr 28, 2017

Copy link
Copy Markdown
Contributor Author

Yes, both have exactly the same content. Let's keep it simple.

@jeremyn
jeremyn merged commit 08fcea4 into EFForg:master Apr 29, 2017
@jeremyn

jeremyn commented Apr 29, 2017

Copy link
Copy Markdown
Contributor

Merged.

@jeremyn jeremyn removed their assignment Apr 29, 2017
@J0WI
J0WI deleted the swissgov branch April 29, 2017 14:11
@J0WI

J0WI commented Apr 29, 2017

Copy link
Copy Markdown
Contributor Author

Thanks!

@J0WI J0WI mentioned this pull request Jul 24, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants