freedns: fix domain splitting for multi-part domains #1807
Conversation
Fixes acmesh-official#1086 Supercedes acmesh-official#1454 Signed-off-by: Joe Groocock <me@frebib.net>
|
This works perfectly for my .co.uk domains - @Neilpang can this be merged please? |
|
I understand that there might be some code-style issues with this PR, if so please leave a review and I will get them fixed and squashed |
|
My FreeDNS domain is a subdomain of a .net. Had the same issue and this PR solves it. Thanks @frebib. |
|
Bump @Neilpang, any reason this (and the other 100+ PRs) can't be merged? |
| _err "Please export as FREEDNS_User / FREEDNS_Password and try again." | ||
| # Check if there is a dot in the top_domain | ||
| # If not, we can't split any more and should assume the domain doesn't exist | ||
| if ! echo "$top_domain" | grep -qF '.'; then |
There was a problem hiding this comment.
could you please not use grep -qF options here ?
it's dangerous
| return 1 | ||
| fi | ||
|
|
||
| subdomain_csv="$(echo "$htmlpage" | tr -d "\n\r" | _egrep_o '<form .*</form>' | sed 's/<tr>/@<tr>/g' | tr '@' '\n' | grep edit.php | grep "$top_domain")" |
There was a problem hiding this comment.
if you trim \r\n before piping to _egrep_o() function, it will not work on solaris.
On solaris, _egrep_o is implemented by sed, but sed on solaris can not work without \n.
please consider replacement
|
sorry, I was just too busy to review code. |
|
This PR just came to my attention. As the original author of the freedns script a user recently reached out to me with this bug. And I just implemented a fix. When considering creating a PR I find that a fix is already proposed. We solve it in a similar manner... looping through all the possible TLD's until one is found to work. Only I did it in-line whereas this PR creates a new function -- which is probably more elegant. Moral is that I should have looked for an existing issue before trying to fix it myself. All that said. I have found additional problems that need addressed. Specifically when we grep for "www.example.com" we (I) forgot that dot is a wildcard. The correct way to grep would be to first escape the dots. Also during testing with a new domain I found that the domain name is not tightly bound by Okay, now what. I could create a PR with my own version of a fix, and @Neilpang can chose between them, or @frebib can address the questions raised by @Neilpang and my comments above. Thoughts? |
|
For reference, my version of the fix is here... dkerr64@465189c David |
|
It's been a long time since I looked at this, and I don't use freedns any more. Please feel free to adapt/ignore this PR and open another one. I don't have the time or bother to take this any further. I'm glad someone else is picking this up again :) |
|
Thank you @frebib. I will do some cleanup on my version of the fix and then submit a new pull request. This is a pretty serious bug so I want to get that done soon -- I just wish it had come to my attention sooner. |
|
I have made the cleanups that I wanted to do. If anyone is monitoring this can you please test the version here... https://raw.githubusercontent.com/dkerr64/acme.sh/FreeDNS/dnsapi/dns_freedns.sh |
|
I tested and it works after adding the flag "--dnssleep 120". FreeDNS has a propgation time of 60 seconds, so the default of 20 is to short. In previous versions the default was 120, but that problem is not related to this PR. The PR is working correctly, for multi TLD and for single TLD. Sorry for the dealy of the response and thanks for fixing this. |
This should address issue #1086.
Supercedes previous PR #1454.
This should fix the situation mentioned in #1454 (comment)