summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
449f75a)
Change-Id: Ibbc6cd4d2871633abaf3489e23f094a62b1cacd2
public MenuCollector generateMenu() throws ServletException {
putPage("/denied", new AccessDenied(), null);
putPage("/error", new PageNotFound(), null);
public MenuCollector generateMenu() throws ServletException {
putPage("/denied", new AccessDenied(), null);
putPage("/error", new PageNotFound(), null);
- putPage("/login", new LoginPage("Password Login"), null);
+ putPage("/login", new LoginPage(), null);
getMenu("SomeCA.org").addItem(new SimpleMenuItem("https://" + ServerConstants.getWwwHostNamePort() + "/login", "Password Login") {
@Override
getMenu("SomeCA.org").addItem(new SimpleMenuItem("https://" + ServerConstants.getWwwHostNamePort() + "/login", "Password Login") {
@Override
- putPage("/", new MainPage("SomeCA - Home"), null);
+ putPage("/", new MainPage(), null);
putPage("/roots", new RootCertPage(truststore), "SomeCA.org");
putPage("/secure", new TestSecure(), null);
putPage("/roots", new RootCertPage(truststore), "SomeCA.org");
putPage("/secure", new TestSecure(), null);
putPage(Certificates.PATH + "/*", new Certificates(), "Certificates");
putPage(RegisterPage.PATH, new RegisterPage(), "SomeCA.org");
putPage(CertificateAdd.PATH, new CertificateAdd(), "Certificates");
putPage(Certificates.PATH + "/*", new Certificates(), "Certificates");
putPage(RegisterPage.PATH, new RegisterPage(), "SomeCA.org");
putPage(CertificateAdd.PATH, new CertificateAdd(), "Certificates");
- putPage(MailOverview.DEFAULT_PATH, new MailOverview("Email addresses"), "Certificates");
- putPage(DomainOverview.PATH + "*", new DomainOverview("Domains"), "Certificates");
+ putPage(MailOverview.DEFAULT_PATH, new MailOverview(), "Certificates");
+ putPage(DomainOverview.PATH + "*", new DomainOverview(), "Certificates");
putPage(AssurePage.PATH + "/*", new AssurePage(), "Web of Trust");
putPage(MyPoints.PATH, new MyPoints(), "Web of Trust");
putPage(AssurePage.PATH + "/*", new AssurePage(), "Web of Trust");
putPage(MyPoints.PATH, new MyPoints(), "Web of Trust");
putPage(ViewOrgPage.DEFAULT_PATH + "/*", new ViewOrgPage(), "Organisation Admin");
putPage(SupportEnterTicketPage.PATH, new SupportEnterTicketPage(), "Support Console");
putPage(ViewOrgPage.DEFAULT_PATH + "/*", new ViewOrgPage(), "Organisation Admin");
putPage(SupportEnterTicketPage.PATH, new SupportEnterTicketPage(), "Support Console");
- putPage(FindUserPage.PATH, new FindUserPage("Find User"), "Support Console");
- putPage(FindDomainPage.PATH, new FindDomainPage("Find Domain"), "Support Console");
+ putPage(FindUserPage.PATH, new FindUserPage(), "Support Console");
+ putPage(FindDomainPage.PATH, new FindDomainPage(), "Support Console");
- putPage(SupportUserDetailsPage.PATH + "*", new SupportUserDetailsPage("Support: User Details"), null);
+ putPage(SupportUserDetailsPage.PATH + "*", new SupportUserDetailsPage(), null);
putPage(ChangePasswordPage.PATH, new ChangePasswordPage(), "My Account");
putPage(ChangePasswordPage.PATH, new ChangePasswordPage(), "My Account");
- putPage(LogoutPage.PATH, new LogoutPage("Logout"), "My Account");
+ putPage(LogoutPage.PATH, new LogoutPage(), "My Account");
putPage(History.PATH, new History(false), "My Account");
putPage(History.SUPPORT_PATH, new History(true), null);
putPage(UserTrainings.PATH, new UserTrainings(false), "My Account");
putPage(History.PATH, new History(false), "My Account");
putPage(History.SUPPORT_PATH, new History(true), null);
putPage(UserTrainings.PATH, new UserTrainings(false), "My Account");
csp.append(";script-src https://" + ServerConstants.getStaticHostNamePortSecure());
csp.append(";style-src https://" + ServerConstants.getStaticHostNamePortSecure());
csp.append(";form-action https://" + ServerConstants.getSecureHostNamePort() + " https://" + ServerConstants.getWwwHostNamePortSecure());
csp.append(";script-src https://" + ServerConstants.getStaticHostNamePortSecure());
csp.append(";style-src https://" + ServerConstants.getStaticHostNamePortSecure());
csp.append(";form-action https://" + ServerConstants.getSecureHostNamePort() + " https://" + ServerConstants.getWwwHostNamePortSecure());
- //csp.append(";report-url https://api.cacert.org/security/csp/report");
+ // csp.append(";report-url https://api.cacert.org/security/csp/report");
csp.append(";script-src http://" + ServerConstants.getStaticHostNamePort());
csp.append(";style-src http://" + ServerConstants.getStaticHostNamePort());
csp.append(";form-action https://" + ServerConstants.getSecureHostNamePort() + " https://" + ServerConstants.getWwwHostNamePort());
csp.append(";script-src http://" + ServerConstants.getStaticHostNamePort());
csp.append(";style-src http://" + ServerConstants.getStaticHostNamePort());
csp.append(";form-action https://" + ServerConstants.getSecureHostNamePort() + " https://" + ServerConstants.getWwwHostNamePort());
- //csp.append(";report-url http://api.cacert.org/security/csp/report");
+ // csp.append(";report-url http://api.cacert.org/security/csp/report");
public static final String LOGIN_RETURNPATH = "login-returnpath";
public static final String LOGIN_RETURNPATH = "login-returnpath";
- public LoginPage(String title) {
- super(title);
+ public LoginPage() {
+ super("Password Login");
public static final String PATH = "/logout";
public static final String PATH = "/logout";
- public LogoutPage(String title) {
- super(title);
+ public LogoutPage() {
+ super("Logout");
Template notLog = new Template(MainPage.class.getResource("MainPageNotLogin.templ"));
Template notLog = new Template(MainPage.class.getResource("MainPageNotLogin.templ"));
- public MainPage(String title) {
- super(title);
+ public MainPage() {
+ super("SomeCA - Home");
public static final String PATH = "/account/domains/";
public static final String PATH = "/account/domains/";
- public DomainOverview(String title) {
- super(title);
+ public DomainOverview() {
+ super("Domains");
public static final String DEFAULT_PATH = "/account/mails";
public static final String DEFAULT_PATH = "/account/mails";
- public MailOverview(String title) {
- super(title);
+ public MailOverview() {
+ super("Email addresses");
public static final String PATH = "/support/find/domain";
public static final String PATH = "/support/find/domain";
- public FindDomainPage(String title) {
- super(title, FindDomainForm.class);
+ public FindDomainPage() {
+ super("Find Domain", FindDomainForm.class);
public static final String PATH = "/support/find/user";
public static final String PATH = "/support/find/user";
- public FindUserPage(String title) {
- super(title);
+ public FindUserPage() {
+ super("Find User");
public static final String PATH = "/support/user/";
public static final String PATH = "/support/user/";
- public SupportUserDetailsPage(String title) {
- super(title);
+ public SupportUserDetailsPage() {
+ super("Support: User Details");