newAdd x-use-https header on http to https redirect
If you connect to http when DA is using https, DA will redirect you to https automatically.
This change simply adds an extra header, so scripts/APIs can check to see if this header is set:
and if it does, then they'll know that DA is using https, and they can notify the Admin to change the API settings accordingly.
newCMD_API versions of CMD_CHANGE_EMAIL_PASSWORD, CMD_CHANGE_FTP_PASSWORD, CMD_EMAIL_ACCOUNT_QUOTA, CMD_EMAIL_ACCOUNT_VACATION
Added these new CMD_API calls:
CMD_API_CHANGE_EMAIL_PASSWORD CMD_API_CHANGE_FTP_PASSWORD CMD_API_EMAIL_ACCOUNT_QUOTA CMD_API_EMAIL_ACCOUNT_VACATION
which are 100% aliases of:
CMD_CHANGE_EMAIL_PASSWORD CMD_CHANGE_FTP_PASSWORD CMD_EMAIL_ACCOUNT_QUOTA CMD_EMAIL_ACCOUNT_VACATION
So, if "api=1" is required, even if you're using CMD_API, you must still pass the GET/POST values "api=1"
The purpose of adding the CMD_API versions of these commands is when the:
option is used in DA... a CMD_API is exempt.
The non-API versions would be given the forced redirect instead of the desired results.
newAllow tokenizer to handle shebang scripts
Previously, scripts passed to the Tokenizer neede to have the file started with the binary to run, eg:
this was fine, but made debugging tricky and annoying.
The Tokernizer class can now accept either:
where #!/bin/sh will be far easier to debug with, saving the need for custom copies when debugging.
(/bin/sh can be replaced with any binary, that's nothing new, eg: #!/usr/local/bin/php)
newApache 2.4.9 and php-fpm HAVE_PHP1_FPM change (TEMPLATES)
Update: Aug 6, 2014: With Apache 2.4.10, these tokens have been removed from the templates:
This applies to CustomBuild 2.0 running Apache and php-fpm.
For the virtual_host2.conf, and related files:
The token value for:
will be affected by the version of apache.
If apache is 2.4.7 or older:
If apache is 2.4.9 or newer:
which will provide different httpd syntax.
fixedlogs_to_keep max hardcoded to 400
The "Apache Logs to Keep" setting (aka directadmin.conf = logs_to_keep) will now have a hardcoded 400 rotation limit.
The default is 5.. so 400 is going to be rather high anyway.
The bug was that there was a silent-fail rotation limit of 200, but some clients were setting 365 rotations which caused the rotation to fail.
In this one case, the /var/log/httpd/domains/domain.com.bytes files were not being rotated at all.. and just kept growing.
This made the apache bytes grow much larger than it actually was.
Current workaround, don't use anything larger than 199.
fixedbreadcrumb when showing a User to point back to correct list (SKINS)
list Users, and when you click them, you'll be viewing the User page, eg:
The fix is to check the referer on the CMD_SHOW_USER page.
If there is a referer, and CMD_ALL_USER_SHOW exists in the referer, then the breadcrumb will point back to CMD_ALL_USER_SHOW
change the TREE:
<a class=tree href="/CMD_USER_SHOW">Show Users</a> to: ```html <a class=tree href="/`USER_REFERER`">Show Users</a>
Where DA will fill the USER_REFERER token with the relevant value.
fixedAdmin/Reseller creation to set correct "skin" based on "docroots"
Both Admins and Reseller don't have a "Skin" selection option in their packages or during their creation.
The skin choice only applies to Users.
The logic is that both Admins and Reseller can change their own skin, and as such will get whatever the "docsroot" is set to, in the directadmin.conf.
They can change it later if they wish.
The bug was that, although the docsroot was correctly set in the user.conf file, the "skin" variable was hardcoded to "enhanced", which wouldn't match the skin if the docsroot was changed.
Fix was to simply figure out the skin name based on the docsroot path, and set accordingly.
fixedFtp backup errors not showing what the error is
Bug introduced in 1.45.0 with this change:
If there are error with the ftp_upload.php script, the backups system will report that there was an error in the backup, and will tell you:
Although a backup error has occurred, the upload of valid backups would have still been attempted to
but the bug was that the actual error message output from the ftp_upload.php wasn't properly added to the result string.
So, until this fix is released.. either grab the pre-release binaries to debug your ftp upload issues.. or else manually test the upload of files through ftp.
You can also manually test the ftp_upload.php to get the exact output that DA should be showing you:
fixedCombine certificate and ca bundle for nginx
If nginx is being used (or the nginx proxy), a bundle needs to be saved directly into the certificate file to work.
This change will create a new file:
anytime a User nginx.conf rewrite is done for a domain with a domain.com.cert and domain.com.ca file, an the certificate will be set accordingly.
If a User is pointing to use the shared server certificate, and
is missing, the user ssl "save" will create the file.
If server.crt.combined exists, it won't be touched.
If an Admin on the shared server IP is saving an SSL cert or ca bundle, it will rewrite the server.crt.combined each time.
fixedCB2.0: Add SSLCACertificateFile to User VirtualHosts is shared cert is used
This is a bug, introduced when Apache 2.4.9 was released.
The issue only happened on CentOS 5. CentOS 6 (newer openssl?) was unaffected.
The related error generated by Apache was:
[Wed Apr 02 03:28:02.003967 2014] [ssl:emerg] [pid 1048] AH02562: Failed to configure certificate www.example.com:443:0 (with chain), check /etc/httpd/conf/ssl.crt/server.crt
[Wed Apr 02 03:28:02.004032 2014] [ssl:emerg] [pid 1048] SSL Library Error: error:0906D06C:PEM routines:PEM_read_bio:no start line (Expecting: DH PARAMETERS) -- Bad file contents or format - or even just a forgotten SSLCertificateKeyFile?
AH00016: Configuration Failed
After hours of trying many different combinations, it was discovered that we were able to get apache running by adding this line:
to ALL VirtualHost entires that used the shared server certificate, mentioned in the error.
Before we added the entry to all relevant 443 VHs, the state was such that:
/etc/httpd/conf/extra/httpd-vhosts.conf did have the server.ca (default VirtualHost for server IP)
/etc/httpd/conf/extra/httpd-ssl.conf did not have the server.ca in:
- All User httpd.conf VirtualHosts that used the server.crt didn't have the server.ca either.
Adding the server.ca to files #2 and #3, Apache started up.
It was also noticed (for custombuild 1.2) that the same applied:
All VirtualHosts that mention the server.crt MUST load the server.ca.
When NO SSLCACertificateFile lines were used at all, apache generated the error and refused to start.
I'm not sure if the contents of the server.ca are relevant... we provide a generic file with many of the common authorities.
As the server.crt is self-signed.. (but also tested with signed, same effect)
fixedOptimize suspension/unsuspension for show_all_users.cache
Upon suspension/unsuspension, the entire show_all_users.cache is recomputed.
The reasoning at the time was that if you trigger it on a Reseller, it's quicker just to recompute the info for all accounts.
When there are more accounts, say 5000, it will not be very efficient, so the fix will be to optimize which accounts are re-computed, rather than all.
Basically, just include all selected accounts, plus any Users they may control, if they are a Reseller or Admin.
Secondary bug found where the forked process to rebuild the cache also held the client socket, so the client connection didn't close until the cache was built.
Fix was to close the client connection (without ssl disconnect) in the cache fork process.
fixedMX name only shows a dot (SKINS)
The name on the left side was only showing a single dot.
The code to fix looks like this:
|?FULL_MX_NAME=| |?FULL_MX_VALUE=| |*if HAVE_FULL_MX_RECORDS="1"| |?FULL_MX_NAME=\`DOMAINFIELD\`.| |?FULL_MX_VALUE=<input type=text name=mx_value size=18>| |*endif|
where the change is in this line:
it was previously:
making it just a dot if the main domain was being edited.
fixedCustom dns IPs for domain.com and www get duplicate merge on restore
If you've got custom IPs for the 2 A records:
during the restore, when DA tries to add the linked IPs for the value the domain is set to... the domain's value gets re-added to the zone.. when that was not the intended result.
The result should have been the custom domain.com. and www A records remain the only A records, instead of duplicates for domain.com. and www being added with the domains IP.
for, example, before:
domain.com. A 188.8.131.52 www A 184.108.40.206
where the domain true IP as set in DA is set to 192.168.1.2
The 220.127.116.11 would be a manual change where the website might be on some other server.
After a restore, DA would have added:
domain.com. A 18.104.22.168 domain.com. A 192.168.1.2 www A 22.214.171.124 www A 192.168.1.2
which would not be the intended result
This fix required somewhat extensive changes to the "add IP" code for linked IPs, so testing in RC phase will be important.
fixed8-bit base64 encode and decode
Previously, the base64 encode/decode ensured that all chracters were only 7-bit (leading bit was 0)
However, password and text can contain characters with values 256 and greater (special characters), so the b64 encode/decode functions were changed to support 8-bits.
fixedLower max session_minutes to 35791
which is 35791 * 60 * 1000 = 2147483648, the maximum signed number that can fit into 32-bits.