ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

CHanged manual URL generation to a util class.

Browse source
This commit is contained in:
Ziver Koc 2021-12-04 22:50:22 +01:00
parent c01367e422
commit 931669bf53
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
hal-core/src/se/hal/daemon/HalExternalWebDaemon.java
View file

@ -13,6 +13,7 @@ import zutil.net.acme.AcmeHttpChallengeFactory;
import zutil.net.acme.AcmeManualDnsChallengeFactory; import zutil.net.acme.AcmeManualDnsChallengeFactory;
import zutil.net.http.HttpPage; import zutil.net.http.HttpPage;
import zutil.net.http.HttpServer; import zutil.net.http.HttpServer;
import zutil.net.http.HttpURL;
import zutil.net.http.page.oauth.OAuth2AuthorizationPage; import zutil.net.http.page.oauth.OAuth2AuthorizationPage;
import zutil.net.http.page.oauth.OAuth2Registry; import zutil.net.http.page.oauth.OAuth2Registry;
import zutil.net.http.page.oauth.OAuth2TokenPage; import zutil.net.http.page.oauth.OAuth2TokenPage;
@ -66,7 +67,12 @@ public class HalExternalWebDaemon implements HalDaemon {
try { try {
if (HalContext.containsProperty(CONFIG_HTTP_EXTERNAL_DOMAIN) && HalContext.containsProperty(CONFIG_HTTP_EXTERNAL_PORT)) { if (HalContext.containsProperty(CONFIG_HTTP_EXTERNAL_DOMAIN) && HalContext.containsProperty(CONFIG_HTTP_EXTERNAL_PORT)) {
externalServerUrl = "https://" + HalContext.getStringProperty(HalContext.CONFIG_HTTP_EXTERNAL_DOMAIN) + ":" + HalContext.getStringProperty(HalContext.CONFIG_HTTP_EXTERNAL_PORT); HttpURL urlGenerator = new HttpURL();
urlGenerator.setProtocol("https");
urlGenerator.setHost(HalContext.getStringProperty(HalContext.CONFIG_HTTP_EXTERNAL_DOMAIN));
urlGenerator.setPort(HalContext.getIntegerProperty(HalContext.CONFIG_HTTP_EXTERNAL_PORT));
externalServerUrl = urlGenerator.getURL();
certificate = acmeDataStore.getCertificate(); certificate = acmeDataStore.getCertificate();
renewCertificate(); renewCertificate();