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

Added some user messages to cert generation

Browse source
This commit is contained in:
Ziver Koc 2021-12-03 02:12:59 +01:00
parent 242d3addef
commit d91556681b
1 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,6 +4,7 @@ import org.shredzone.acme4j.exception.AcmeException;
import se.hal.HalContext; import se.hal.HalContext;
import se.hal.intf.HalDaemon; import se.hal.intf.HalDaemon;
import se.hal.intf.HalWebPage; import se.hal.intf.HalWebPage;
import se.hal.page.HalAlertManager;
import se.hal.util.HalAcmeDataStore; import se.hal.util.HalAcmeDataStore;
import se.hal.util.HalOAuth2RegistryStore; import se.hal.util.HalOAuth2RegistryStore;
import zutil.log.LogUtil; import zutil.log.LogUtil;
@ -15,6 +16,7 @@ import zutil.net.http.HttpServer;
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;
import zutil.ui.UserMessageManager;
import java.io.IOException; import java.io.IOException;
import java.security.GeneralSecurityException; import java.security.GeneralSecurityException;
@ -71,9 +73,13 @@ public class HalExternalWebDaemon implements HalDaemon {
startHttpServer(); startHttpServer();
} else { } else {
logger.warning("Missing '" + CONFIG_HTTP_EXTERNAL_PORT + "' and '" + CONFIG_HTTP_EXTERNAL_DOMAIN + "' configuration, will not setup external http server."); logger.warning("Missing '" + CONFIG_HTTP_EXTERNAL_PORT + "' and '" + CONFIG_HTTP_EXTERNAL_DOMAIN + "' configuration, will not setup external http server.");
HalAlertManager.getInstance().addAlert(new UserMessageManager.UserMessage(
UserMessageManager.MessageLevel.WARNING, "Missing '" + CONFIG_HTTP_EXTERNAL_PORT + "' and '" + CONFIG_HTTP_EXTERNAL_DOMAIN + "' configuration, will not setup external http server.", UserMessageManager.MessageTTL.DISMISSED));
} }
} catch (Exception e) { } catch (Exception e) {
logger.log(Level.SEVERE, "Was unable to initiate external web server.", e); logger.log(Level.SEVERE, "Was unable to initiate external web server.", e);
HalAlertManager.getInstance().addAlert(new UserMessageManager.UserMessage(
UserMessageManager.MessageLevel.ERROR, "Was unable to initiate external web server.", UserMessageManager.MessageTTL.DISMISSED));
} }
} }
@ -104,8 +110,14 @@ public class HalExternalWebDaemon implements HalDaemon {
acme.prepareRequest(); acme.prepareRequest();
certificate = acme.requestCertificate(); certificate = acme.requestCertificate();
acmeDataStore.storeCertificate(certificate); acmeDataStore.storeCertificate(certificate);
logger.info("SSL certificate successfully generated.");
HalAlertManager.getInstance().addAlert(new UserMessageManager.UserMessage(
UserMessageManager.MessageLevel.INFO, "SSL certificate successfully generated.", UserMessageManager.MessageTTL.DISMISSED));
} else { } else {
logger.warning("No SSL certificate is configured for external HTTP Server."); logger.warning("No SSL certificate is configured for external HTTP Server.");
HalAlertManager.getInstance().addAlert(new UserMessageManager.UserMessage(
UserMessageManager.MessageLevel.WARNING, "No SSL certificate is configured for external HTTP Server.", UserMessageManager.MessageTTL.DISMISSED));
certificate = null; certificate = null;
} }