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

Update Arch.xml #5025

Merged
merged 16 commits into from
Jan 11, 2017
Merged

Update Arch.xml #5025

merged 16 commits into from
Jan 11, 2017

Conversation

Bisaloo
Copy link
Collaborator

@Bisaloo Bisaloo commented Jun 4, 2016

  • Add new subdomains
  • Follow new style guidelines

- Add new subdomains

- Follow new style guidelines
@J0WI J0WI added the conflict label Jun 4, 2016
@Bisaloo
Copy link
Collaborator Author

Bisaloo commented Jun 4, 2016

I edited from a branch that wasn't up-to-date. What can I do to solve this conflict?

Well, actually, my changes were using done from the latest EFForg/master version, I just didn't fork from this version. Sorry about that, I am still kinda new to this.

@J0WI
Copy link
Contributor

J0WI commented Jun 21, 2016

You can use git rebase to solve conflicts.

@jeremyn
Copy link
Contributor

jeremyn commented Nov 28, 2016

@Bisaloo Are you still interested in working on this?

@Bisaloo
Copy link
Collaborator Author

Bisaloo commented Jan 6, 2017

@jeremyn sorry for taking so long, it can be merged now (unless you have suggestions).

I am just unsure what should be done about private subdomains like https://repos.archlinux.org

@jeremyn jeremyn self-assigned this Jan 7, 2017
@jeremyn
Copy link
Contributor

jeremyn commented Jan 9, 2017

Thanks. Please make the following changes:

  • Add a top comment like I have below. For another example of a top comment, see here. For more information on the No working URL known comment, see here.
<!--
	Invalid certificate:
		alberich.archlinux.org
		apollo.archlinux.org
		aur-dev.archlinux.org
		aur4.archlinux.org
		gudrun.archlinux.org
		orion.archlinux.org
		quassel.archlinux.org
		rsync.archlinux.org
		soyuz.archlinux.org
		static.archlinux.org
		tracker.archlinux.org

	No working URL known:
		repos.archlinux.org (403)
		stats.archlinux.org (401)

	Refused:
		mail.archlinux.org
		mx.archlinux.org
		nymeria.archlinux.org

-->
  • Clean up the whitespace, for example remove the extra tab here and remove the spaces before to here. Note that we prefer tab indents, following our style guide.
  • Change the ruleset name to archlinux.org
  • Change the filename to Archlinux.org.xml (do this in a separate commit by itself, please, to make it easier to see the diff)
  • Remove these lines
  • Add tracker to the aur-dev rule like what I have below, and delete the tracker rule:
	<rule from="^http://(aur-dev|tracker)\.archlinux\.org/"
		to="https://bbs.archlinux.org/" />
  • We like to sort subdomains in alphabetical order starting from the top level domain at the right reading left, moving ^ and www to the top of their group. For example:
example.com
www.example.com
a.example.com
www.a.example.com
b.a.example.com
b.example.com
example.net
www.example.net
a.example.net

In this specific ruleset, please move the archlinux.org and www.archlinux.org targets to the top.

  • Update the securecookie here to what I have below. The reason is a little obscure and has to do with the relatively large number of nonworking subdomains, explained further at Create Thewarehouse.co.nz.xml #7527 (comment). I might normally just ask you to delete the securecookie entirely, but since we're modifying a ruleset that already exists, instead let's just modify what's there.
<securecookie host="^(archive\.|aur\.|bbs\.|bugs\.|dev\.|git\.|lists\.|luna\.|mailman\.|master-key\.|packages\.|patchwork\.|planet\.|projects\.|releng\.|security\.|sources\.|tracker\.|wiki\.|www\.)archlinux.org" name=".+" />
  • We like to squash-and-merge pull requests, which means we combine and rewrite pull requests in your name. Is that all right with you for this and any other pull requests you submit to us?
  • For this pull request, do you mind if I delete your commit messages when I squash-and-merge?

@Bisaloo
Copy link
Collaborator Author

Bisaloo commented Jan 9, 2017

I think that's it. Thank you for your help!

I haven't included in the comment URLs found by sublist3r if they lead to a 404 error and can't be found on google.

Regarding your last two points, yes, it's fine by me.

@jeremyn
Copy link
Contributor

jeremyn commented Jan 9, 2017

Thanks @Bisaloo.

Can you please however move the top comment outside of the ruleset tag, to the very top, like we have here?

Also, for

I haven't included in the comment URLs found by sublist3r if they lead to a 404 error and can't be found on google.

I'm not sure what you mean. Can you give an example?

@Bisaloo
Copy link
Collaborator Author

Bisaloo commented Jan 9, 2017

Should I add nymeria.archlinux.org in the comment?

<!--
	Invalid certificate:
		alberich.archlinux.org
		aur-dev.archlinux.org
		aur4.archlinux.org
		gudrun.archlinux.org
		rsync.archlinux.org
		static.archlinux.org
		tracker.archlinux.org

	No working URL known:
		repos.archlinux.org (403)

	Refused:
		nymeria.archlinux.org

-->

orion.archlinux.org or apollo.archlinux.org return 404

Otherwise, it's not actually a 404 but I don't know what to do with domains found by sublist3r like

  • celestia.archlinux.org
  • dom0.archlinux.org
  • dragon.archlinux.org
  • gerolde.archlinux.org
  • sigurd.archlinux.org
  • vostok.archlinux.org

@jeremyn
Copy link
Contributor

jeremyn commented Jan 10, 2017

I see what you mean. There's some judgment involved here.

I don't want to mention subdomains that refuse to connect even with plain HTTP like http://celestia.archlinux.org or http://dom0.archlinux.org.

Also there's a sort of a sequence of potential errors, and if both HTTPS and plain HTTP error but HTTPS errors earlier in the sequence, then you might mention that. For example http://mail.archlinux.org gets a 401 but https://mail.archlinux.org gets Refused, and Refused is earlier than 401, so we can mention mail as Refused. Similarly http://apollo.archlinux.org gets a 404 but https://apollo.archlinux.org gets an Invalid certificate, and Invalid certificate is before 404 so we can mention apollo.

The main reason, in my opinion, that we even list nonworking subdomains is to give information to the next person that looks at the ruleset. They may have a list of subdomains in mind and we want them to know what we've already considered and why some didn't get made into targets. On the other hand they are less likely to care about subdomains that appear entirely or almost entirely nonworking, so we leave those off to decrease clutter.

Anyway I've updated the top comment in the checklist with some new subdomains, so please feel free to drop that in, or ask me if you have questions.

@Bisaloo
Copy link
Collaborator Author

Bisaloo commented Jan 10, 2017

I agree with you about adding as much as possible in the comment in order to help the next person looking at the ruleset.

I trust your judgment on this and I updated the top comment according to your recommendation.

@jeremyn
Copy link
Contributor

jeremyn commented Jan 11, 2017

Thanks for catching that I left out apollo in the modified comment in the checklist. I've updated the comment in the checklist to include apollo.

I've also added one new item to the checklist about the securecookie tag, along with an explanation.

@Bisaloo
Copy link
Collaborator Author

Bisaloo commented Jan 11, 2017

I've also added one new item to the checklist about the securecookie tag, along with an explanation.

I wouldn't have thought about that but that makes perfect sense.

@jeremyn
Copy link
Contributor

jeremyn commented Jan 11, 2017

Thanks. Can you please also remove the extra tab from the beginning of this line?

@jeremyn jeremyn merged commit 0ed6165 into EFForg:master Jan 11, 2017
@jeremyn
Copy link
Contributor

jeremyn commented Jan 11, 2017

Thanks again, merged.

@jeremyn jeremyn removed the conflict label Jan 11, 2017
@jeremyn jeremyn removed their assignment Jan 11, 2017
@Bisaloo Bisaloo deleted the Bisaloo-arch branch March 4, 2017 15:01
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.

4 participants