`state` varchar(2) NOT NULL,
`province` varchar(100) NOT NULL,
`city` varchar(100) NOT NULL,
+ `contactEmail` varchar(100) NOT NULL,
`creator` int(11) NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
`codesign` tinyint(1) NOT NULL DEFAULT '0',
`md` enum('md5','sha1','sha256','sha512') NOT NULL DEFAULT 'sha512',
`profile` int(3) NOT NULL,
+ `caid` int(3) NULL DEFAULT NULL,
`csr_name` varchar(255) NOT NULL DEFAULT '',
`csr_type` enum('CSR', 'SPKAC') NOT NULL,
`type` enum('email','DNS') NOT NULL
) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
-
+DROP TABLE IF EXISTS `cacerts`;
+CREATE TABLE `cacerts` (
+ `id` int(3) NOT NULL AUTO_INCREMENT,
+ `keyname` varchar(60) NOT NULL,
+ `subroot` int(2) NOT NULL,
+ `validFrom` datetime NULL DEFAULT NULL,
+ `validTo` datetime NULL DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE (`keyname`)
+) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
DROP TABLE IF EXISTS `jobs`;
`type` varchar(100) NOT NULL DEFAULT '',
`information` varchar(50) NOT NULL DEFAULT '',
PRIMARY KEY (`when`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
\ No newline at end of file
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
private String city;
- public Organisation(String name, String state, String province, String city, User creator) {
+ private String email;
+
+ public Organisation(String name, String state, String province, String city, String email, User creator) {
this.name = name;
this.state = state;
this.province = province;
this.city = city;
+ this.email = email;
int id = super.insert();
- GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("INSERT INTO organisations SET id=?, name=?, state=?, province=?, city=?, creator=?");
+ GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("INSERT INTO organisations SET id=?, name=?, state=?, province=?, city=?, contactEmail=?, creator=?");
ps.setInt(1, id);
ps.setString(2, name);
ps.setString(3, state);
ps.setString(4, province);
ps.setString(5, city);
- ps.setInt(6, creator.getId());
+ ps.setString(6, email);
+ ps.setInt(7, creator.getId());
synchronized (Organisation.class) {
ps.execute();
}
state = rs.getString("state");
province = rs.getString("province");
city = rs.getString("city");
+ city = rs.getString("contactEmail");
}
public String getName() {
return city;
}
+ public String getContactEmail() {
+ return email;
+ }
+
public static synchronized Organisation getById(int id) {
CertificateOwner co = CertificateOwner.getById(id);
if (co instanceof Organisation) {
private String l = "";
+ private String email = "";
+
private boolean isEdit = false;
public CreateOrgForm(HttpServletRequest hsr) {
c = t.getState();
st = t.getProvince();
l = t.getCity();
+ email = t.getContactEmail();
}
@Override
c = req.getParameter("C");
st = req.getParameter("ST");
l = req.getParameter("L");
+ email = req.getParameter("contact");
if (result != null) {
result.update(o, c, st, l);
return true;
}
- Organisation ne = new Organisation(o, c, st, l, LoginPage.getUser(req));
+ Organisation ne = new Organisation(o, c, st, l, email, LoginPage.getUser(req));
result = ne;
return true;
}
User u2 = User.getById(createVerifiedUser("fn", "ln", createUniqueName() + "@email.org", TEST_PASSWORD));
User u3 = User.getById(createVerifiedUser("fn", "ln", createUniqueName() + "@email.org", TEST_PASSWORD));
User u4 = User.getById(createVerifiedUser("fn", "ln", createUniqueName() + "@email.org", TEST_PASSWORD));
- Organisation o1 = new Organisation("name", "ST", "prov", "city", u1);
+ Organisation o1 = new Organisation("name", "ST", "prov", "city", "email", u1);
assertEquals(0, o1.getAllAdmins().size());
o1.addAdmin(u2, u1, false);
assertEquals(1, o1.getAllAdmins().size());
@Test
public void testNonAssurerSeeOnlyOwn() throws IOException {
User u2 = User.getById(createVerifiedUser("testworker", "testname", createUniqueName() + "@testdom.com", TEST_PASSWORD));
- Organisation o1 = new Organisation("name21", "DE", "sder", "Rostov", u);
- Organisation o2 = new Organisation("name12", "DE", "sder", "Rostov", u);
+ Organisation o1 = new Organisation("name21", "DE", "sder", "Rostov", "email", u);
+ Organisation o2 = new Organisation("name12", "DE", "sder", "Rostov", "email", u);
o1.addAdmin(u2, u2, false);
String session2 = login(u2.getEmail(), TEST_PASSWORD);