"points" int NOT NULL DEFAULT '0',
# awarded and the "experience points" are calculated virtually
# Face to Face is default, TOPUP is for the remaining 30Points after two TTP
-# TTP is default ttp assurance
+# TTP is default ttp verification
"method" "notaryType" NOT NULL DEFAULT 'Face to Face Meeting',
"location" varchar(255) NOT NULL DEFAULT '',
"date" varchar(255) NOT NULL DEFAULT '',
-# date when assurance was entered
+# date when verification was entered
"when" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
#?
"expire" timestamp NULL DEFAULT NULL,
#?????????????????
"sponsor" int NOT NULL DEFAULT '0',
-# date when assurance was deleted (or 0)
+# date when verification was deleted (or 0)
"deleted" timestamp NULL DEFAULT NULL,
PRIMARY KEY ("id")
);
public enum Group {
SUPPORTER("supporter", "supporter"), ARBITRATOR("arbitrator", "arbitrator"), //
- BLOCKEDASSURER("blockedassurer", "may not assure"), BLOCKEDASSUREE("blockedassuree", "may not be assured"), //
+ BLOCKEDASSURER("blockedassurer", "may not verify"), BLOCKEDASSUREE("blockedassuree", "may not be verified"), //
BLOCKEDLOGIN("blockedlogin", "may not login"), BLOCKEDCERT("blockedcert", "may not issue certificates"), //
- TTP_ASSURER("ttp-assurer", "may assure via TTP"), TTP_APPLICANT("ttp-applicant", "requests to be assured via ttp"), //
- CODESIGNING("codesigning", "may issue codesigning certificates"), ORGASSURER("orgassurer", "may assure organisations"), //
+ TTP_ASSURER("ttp-assurer", "may verify via TTP"), TTP_APPLICANT("ttp-applicant", "requests to be verified via ttp"), //
+ CODESIGNING("codesigning", "may issue codesigning certificates"), ORGASSURER("orgassurer", "may verify organisations"), //
NUCLEUS_ASSURER("nucleus-assurer", "may issue nucleus assurances"), LOCATE_AGENT("locate-agent", "wants access to the locate agent system");
private final String dbName;
private SchemedName scheme;
/**
- * This name should not get assured anymore and therefore not be displayed
+ * This name should not get verifed anymore and therefore not be displayed
* to the RA-Agent. This state is irrevocable.
*/
private boolean deprecated;
<table class="table">
<tr>
-<th colspan="7"><?=_Assurances?></th>
+<th colspan="7"><?=_Verifications?></th>
</tr>
<tr>
<td><?=_Id?></td>
<h4><?=_Org Client and Server Certificates?></h4>
<p><?=_Once you have verified your company you will see these menu options. They allow you to issue as many certificates as you like without proving individual email accounts as you like, further more you are able to get your company details on the certificate.?></p>
<h4><?=_ET Web of Trust?></h4>
-<p><?=_The Web of Trust system ET uses is similar to that many involved with GPG/PGP use, they hold face to face meetings to verify each others photo identities match their GPG/PGP key information. ET differs however in that we have modified things to work within the PKI framework, for you to gain trust in the system you must first locate someone already trusted. The trust person depending how many people they've trusted or meet before will determine how many points they can issue to you. Once you've met up you can show your ID and you will need to fill out a verification form which the person assuring your details must retain for verification reasons.?></p>
+<p><?=_The Web of Trust system ET uses is similar to that many involved with GPG/PGP use, they hold face to face meetings to verify each others photo identities match their GPG/PGP key information. ET differs however in that we have modified things to work within the PKI framework, for you to gain trust in the system you must first locate someone already trusted. The trust person depending how many people they've trusted or meet before will determine how many points they can issue to you. Once you've met up you can show your ID and you will need to fill out a verification form which the person verifying your details must retain for verification reasons.?></p>
<p><b><?=_For information about the TTP-assisted-verification program please read !'<a href="//wiki.cacert.org/TTP/TTPuser">https://wiki.cacert.org/TTP/TTPuser</a>' and !'<a href="//wiki.cacert.org/TTP/TTPAL"> https://wiki.cacert.org/TTP/TTPAL</a>'.?></b></p>
-<button class="btn btn-primary" type="submit" name="new-val" value="enable"<?=$enable?>><?=_Enable Find-Assurer Access?></button>
-<button class="btn btn-primary" type="submit" name="new-val" value="disable"<?=$disable?>><?=_Disable Find-Assurer Access?></button>
+<button class="btn btn-primary" type="submit" name="new-val" value="enable"<?=$enable?>><?=_Enable Find-RA-Agent Access?></button>
+<button class="btn btn-primary" type="submit" name="new-val" value="disable"<?=$disable?>><?=_Disable Find-RA-Agent Access?></button>
throw gae;
}
if (date == null || date.equals("")) {
- gae.mergeInto(new GigiApiException("You must enter the date when you met the assuree."));
+ gae.mergeInto(new GigiApiException("You must enter the date when you met the applicant."));
} else {
try {
Date d = DateSelector.getDateFormat().parse(date);
}
if ( !assuree.getDoB().equals(dob)) {
- gae.mergeInto(new GigiApiException("The person you are assuring changed his personal details."));
+ gae.mergeInto(new GigiApiException("The person you are verifying changed his personal details."));
}
if (awarded < 0) {
Organisation o1 = createUniqueOrg();
o1.addAdmin(u3, u, true);
try {
- // must fail because u4 is no assurer
+ // must fail because u4 is no RA-Agent
o1.addAdmin(u4_dummy, u3, false);
fail("No exception!");
} catch (GigiApiException e) {
} catch (GigiApiException e) {
}
try {
- // must fail because u4 is no assurer
+ // must fail because u4 is no RA-Agent
o1.addAdmin(u4_dummy, u, false);
fail("No exception!");
} catch (GigiApiException e) {
}
/**
- * Creates a new user with 100 Assurance points given by an (invalid)
- * assurance.
+ * Creates a new user with 100 Verification Points given by an (invalid)
+ * verification.
*
* @param firstName
* the first name
// points too high
assuranceFail(assuranceUser, assuree, 11, "notary-junit-test", validVerificationDateString());
- // assure oneself
+ // verify oneself
assuranceFail(assuranceUser, assuranceUser, 10, "notary-junit-test", validVerificationDateString());
// not an assurer
assuranceFail(assuree, assuranceUser, 10, "notary-junit-test", validVerificationDateString());
// valid
Notary.assure(assuranceUser, assuree, assuree.getPreferredName(), assuree.getDoB(), 10, "notary-junit-test", validVerificationDateString(), AssuranceType.FACE_TO_FACE);
- // assure double
+ // verify double
assuranceFail(assuranceUser, assuree, 10, "notary-junit-test", validVerificationDateString());
}
String mail = "test-assurer" + i + "@example.com";
User u = User.getByEmail(mail);
if (u == null) {
- System.out.println("Creating assurer");
+ System.out.println("Creating RA-Agent");
createUser(mail);
u = User.getByEmail(mail);
passCATS(u, CATSType.ASSURER_CHALLENGE);
if (vp < 10) {
currentVP = vp;
}
- Notary.assure(getAssurer(agentNumber), byEmail, byEmail.getPreferredName(), byEmail.getDoB(), currentVP, "Testmanager Assure up code", "2014-11-06", AssuranceType.FACE_TO_FACE);
+ Notary.assure(getAssurer(agentNumber), byEmail, byEmail.getPreferredName(), byEmail.getDoB(), currentVP, "Testmanager Verify up code", "2014-11-06", AssuranceType.FACE_TO_FACE);
agentNumber += 1;
vp -= currentVP;
}
<input type="submit" value="Add CATs" name="cats"/>
</td></tr>
<tr><td>
-Add 100 Assurance points:
+Add 100 Verification Points:
</td><td>
Email: <input type="text" name="assureEmail"/>
</td><td>
</td></tr>
<tr><td>
-Assure 25 others (get 25 experience points) :
+Verify 25 others (get 25 Experience Points) :
</td><td>
Email: <input type="text" name="letassureEmail"/>
</td><td>
-<input type="submit" value="Add 25 experience Points" name="letassure"/>
+<input type="submit" value="Add 25 Experience Points" name="letassure"/>
</td></tr>
<tr><td>
projects / gigi.git / commitdiff