Permalink
Browse files

many changes across the board to allow for non-senate user registrati…

…on and viewing
  • Loading branch information...
1 parent ca5b5ec commit 723f49aa9ea84df24a73fbce4940ad53951467fe Jared Williams committed Jan 14, 2011
Showing with 1,350 additions and 110 deletions.
  1. +7 −1 pom.xml
  2. +7 −0 schema.xml
  3. +13 −15 src/main/java/gov/nysenate/opendirectory/filters/ServiceFilter.java
  4. +97 −0 src/main/java/gov/nysenate/opendirectory/models/ExternalPerson.java
  5. +2 −1 src/main/java/gov/nysenate/opendirectory/models/Person.java
  6. +7 −0 src/main/java/gov/nysenate/opendirectory/models/interfaces/IPerson.java
  7. +157 −14 src/main/java/gov/nysenate/opendirectory/servlets/NonSenateAccessServlet.java
  8. +1 −1 src/main/java/gov/nysenate/opendirectory/servlets/UserServlet.java
  9. +20 −2 src/main/java/gov/nysenate/opendirectory/solr/SecureLoader.java
  10. +23 −3 src/main/java/gov/nysenate/opendirectory/solr/SecureWriter.java
  11. +2 −1 src/main/java/gov/nysenate/opendirectory/solr/Solr.java
  12. +42 −38 src/main/java/gov/nysenate/opendirectory/solr/SolrSession.java
  13. +752 −0 src/main/java/gov/nysenate/opendirectory/utils/BCrypt.java
  14. +14 −3 src/main/java/gov/nysenate/opendirectory/utils/Request.java
  15. +7 −0 src/main/webapp/css/application.css
  16. +15 −0 src/main/webapp/js/external.js
  17. +2 −0 src/main/webapp/jsp/about.jsp
  18. +5 −0 src/main/webapp/jsp/external/footer.jsp
  19. +26 −0 src/main/webapp/jsp/external/header.jsp
  20. +4 −23 src/main/webapp/jsp/{access.jsp → external/index.jsp}
  21. +37 −0 src/main/webapp/jsp/external/login.jsp
  22. +30 −0 src/main/webapp/jsp/external/message.jsp
  23. +67 −0 src/main/webapp/jsp/external/register.jsp
  24. +2 −0 src/main/webapp/jsp/faq.jsp
  25. +11 −8 src/main/webapp/jsp/header.jsp
View
8 pom.xml
@@ -20,7 +20,13 @@
<version>2.4</version>
<scope>compile</scope>
</dependency>
-
+ <dependency>
+ <groupId>org.jasypt</groupId>
+ <artifactId>jasypt</artifactId>
+ <version>1.7</version>
+ <classifier>lite</classifier>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
View
7 schema.xml
@@ -182,6 +182,13 @@
<field name="unprocessedInterests" type="string" indexed="false" stored="true" />
<field name="modified" type="textgen" indexed="true" stored="true"/>
<field name="frontPage" type="textgen" indexed="true" stored="true"/>
+ <field name="hash" type="string" indexed="false" stored="true" />
+ <field name="authorized" type="string" indexed="false" stored="true" />
+ <field name="authorizationHash" type="string" indexed="false" stored="true" />
+
+ doc.addField("hash", person.getHash());
+ doc.addField("authorized", person.getAuthorized());
+ doc.addField("authorizationHash", person.getAuthorizationHash());
<!-- catchall field, containing all other searchable text fields (implemented
via copyField further on in this schema
View
28 src/main/java/gov/nysenate/opendirectory/filters/ServiceFilter.java
@@ -31,24 +31,22 @@ public void destroy() {
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
if(((HttpServletRequest)request).getSession().getAttribute("uid") == null) {
- if(!request.getRemoteAddr().matches(IP_MATCH)) {
- String uri = ((HttpServletRequest)request).getRequestURI();
-
- if(uri.contains("/external") || uri.matches("^/opendirectory/(css|img)/.+$")) {
- chain.doFilter(request, response);
+ if(((HttpServletRequest)request).getSession().getAttribute("externalPerson") == null) {
+ if(!request.getRemoteAddr().matches(IP_MATCH)) {
+ String uri = ((HttpServletRequest)request).getRequestURI();
+
+ if(uri.contains("/external") || uri.matches("^/opendirectory/(css|img|js/external)/.+$")) {
+
+ }
+ else {
+ UrlMapper urls = new UrlMapper();
+ ((HttpServletResponse)response).sendRedirect(urls.url("external"));
+ return;
+ }
}
- else {
- UrlMapper urls = new UrlMapper();
- ((HttpServletResponse)response).sendRedirect(urls.url("external", "login"));
- }
- }
- else {
- chain.doFilter(request, response);
}
}
- else {
- chain.doFilter(request, response);
- }
+ chain.doFilter(request, response);
}
public void init(FilterConfig fConfig) throws ServletException {
View
97 src/main/java/gov/nysenate/opendirectory/models/ExternalPerson.java
@@ -0,0 +1,97 @@
+package gov.nysenate.opendirectory.models;
+
+import java.util.Arrays;
+import java.util.TreeSet;
+
+import gov.nysenate.opendirectory.models.interfaces.IPerson;
+import gov.nysenate.opendirectory.utils.BCrypt;
+
+public class ExternalPerson implements IPerson {
+
+ private String firstName;
+ private String lastName;
+ private String email;
+ private String phone;
+ private String hash;
+ private TreeSet<String> credentials;
+ public boolean authorized;
+ public String authorizationHash;
+
+ public ExternalPerson() {
+ setFirstName("");
+ setLastName("");
+ setEmail("");
+ setPhone("");
+ setHash("");
+ setAuthorized(false);
+ }
+
+ public ExternalPerson(String firstName, String lastName, String email,
+ String phone) {
+ this.firstName = firstName;
+ this.lastName = lastName;
+ this.email = email;
+ this.phone = phone;
+ }
+
+ public String getFirstName() {
+ return firstName;
+ }
+ public String getLastName() {
+ return lastName;
+ }
+ public String getEmail() {
+ return email;
+ }
+ public String getPhone() {
+ return phone;
+ }
+ public String getHash() {
+ return hash;
+ }
+ public TreeSet<String> getCredentials() {
+ return new TreeSet<String>(Arrays.asList("senate"));
+ }
+ public boolean getAuthorized() {
+ return authorized;
+ }
+ public String getAuthorizationHash() {
+ return authorizationHash;
+ }
+ public void setFirstName(String firstName) {
+ this.firstName = firstName;
+ }
+ public void setLastName(String lastName) {
+ this.lastName = lastName;
+ }
+ public void setEmail(String email) {
+ this.email = email;
+ }
+ public void setPhone(String phone) {
+ this.phone = phone;
+ }
+ public void setHash(String hash) {
+ this.hash = hash;
+ }
+ public void setCredentials(TreeSet<String> credentials) {
+ this.credentials = credentials;
+ }
+ public void setAuthorized(boolean authorized) {
+ this.authorized = authorized;
+ }
+ public void setAuthorizationHash(String authorizationHash) {
+ this.authorizationHash = authorizationHash;
+ }
+
+
+
+ public boolean checkPassword(String password) {
+ return BCrypt.checkpw(password, hash);
+ }
+
+ public void encryptPassword(String password) {
+ this.hash = BCrypt.hashpw(password, BCrypt.gensalt());
+ }
+
+
+}
View
3 src/main/java/gov/nysenate/opendirectory/models/Person.java
@@ -1,5 +1,6 @@
package gov.nysenate.opendirectory.models;
+import gov.nysenate.opendirectory.models.interfaces.IPerson;
import gov.nysenate.opendirectory.solr.Solr;
import gov.nysenate.opendirectory.solr.SolrSession;
import gov.nysenate.opendirectory.utils.SerialUtils;
@@ -19,7 +20,7 @@
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-public class Person implements Comparable<Person> {
+public class Person implements Comparable<Person>, IPerson {
/**
* Designed according to JavaBean specs for use in the
* Java Expressions Language (EL) of JSP 2.0+
View
7 src/main/java/gov/nysenate/opendirectory/models/interfaces/IPerson.java
@@ -0,0 +1,7 @@
+package gov.nysenate.opendirectory.models.interfaces;
+
+import java.util.TreeSet;
+
+public interface IPerson {
+ public TreeSet<String> getCredentials();
+}
View
171 src/main/java/gov/nysenate/opendirectory/servlets/NonSenateAccessServlet.java
@@ -1,15 +1,20 @@
package gov.nysenate.opendirectory.servlets;
import gov.nysenate.opendirectory.ldap.Ldap;
+import gov.nysenate.opendirectory.models.ExternalPerson;
+import gov.nysenate.opendirectory.servlets.UserServlet.UserServletException;
import gov.nysenate.opendirectory.utils.Request;
import java.io.IOException;
+import java.io.PrintWriter;
import javax.naming.NamingException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.solr.client.solrj.SolrServerException;
+
public class NonSenateAccessServlet extends BaseServlet {
@@ -27,27 +32,165 @@ public NonSenateAccessServlet() {
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
Request self = new Request(this,request,response);
- self.render("access.jsp");
+ String command = urls.getCommand(request);
+
+ try {
+ if(command == null) {
+ self.render("external/index.jsp");
+ }
+ else if(command.equals("login")) {
+ self.render("external/login.jsp");
+ }
+ else if(command.equals("logout")) {
+ self.httpSession.removeAttribute("externalPerson");
+ self.redirect(urls.url("external"));
+ }
+ else if(command.equals("register")) {
+ self.render("external/register.jsp");
+ }
+ else throw new ExternalServletException("Invalid command `"+command+"` supplied.");
+ } catch (ExternalServletException e) {
+ doException(self,e);
+ }
}
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
Request self = new Request(this,request,response);
String command = urls.getCommand(request);
try {
- //If they are posting to a bad place,
- if(command == null)
- throw new ExternalServletException("No command supplied to POST request.");
-
- if(command.equals("login")) {
- doLogin(self);
-
+ if(command == null){
+ doLogin(self);
+ }
+ else if(command.equals("login")) {
+ doExternalLogin(self);
+ }
+ else if(command.equals("register")) {
+ doExternalRegister(self);
+ }
+ else if(command.equals("auth")) {
+ doExternalAuth(self);
}
+ else throw new ExternalServletException("Invalid command `"+command+"` supplied.");
} catch (ExternalServletException e) {
doException(self,e);
- }
+ } catch (SolrServerException e) {
+ e.printStackTrace();
+ }
}
+ private void doExternalRegister(Request self) throws IOException, ServletException, SolrServerException {
+ String firstName = (String)self.httpRequest.getParameter("firstName");
+ String lastName = (String)self.httpRequest.getParameter("lastName");
+ String email1 = (String)self.httpRequest.getParameter("email1");
+ String email2 = (String)self.httpRequest.getParameter("email2");
+ String password1 = (String)self.httpRequest.getParameter("pword1");
+ String password2 = (String)self.httpRequest.getParameter("pword2");
+ String phone = (String)self.httpRequest.getParameter("phone2");
+
+ String error = "";
+ if(firstName == null || firstName.equals("")) {
+ error += "<br/>Entered your first name.";
+ }
+ if(lastName == null || lastName.equals("")) {
+ error += "<br/>Entered your last name.";
+ }
+ if(phone.equals("(###) ###-####")) {
+ error += "<br/>Entered a phone number";
+ }
+ else {
+ if(!phone.matches("\\(\\d{3}\\)[ \\-]?\\d{3}\\-\\d{4}")) {
+ error += "<br/>Used (###) ###-#### for your phone number format";
+ }
+ }
+ if(password1.length() < 8) {
+ error += "<br/>Entered a password at least 8 characters long";
+ }
+ else {
+ if(!password1.equals(password2)) {
+ error += "<br/>Entered matching passwords";
+ }
+ }
+ if(email1 == null || email1.equals("") || !email1.matches(".+?@(.*+\\.state\\.ny\\.us|ny\\.gov)")) {
+ error += "<br/>Entered a valid email address (ending in state.ny.us or ny.gov)";
+ }
+ else {
+ if(email2 == null || !email1.equals(email2)) {
+
+ }
+ else {
+ ExternalPerson person = self.solrSession.loadExternalPersonByEmail(email1);
+ if(person != null) {
+ if(person.getAuthorized()) {
+ error = "<br/>That email address already exists on OpenDirectory. If you need help " +
+ "retrieving your password please " +
+ "<a href=\"http://www.nysenate.gov/contact\">contact us</a>.";
+ }
+ else {
+ error = "<br/>That email address already exists on OpenDirectory, so we've dispatched " +
+ "another activation email. If you do not receive the email or have any questions " +
+ "please <a href=\"http://www.nysenate.gov/contact\">contact us</a>.";
+ //TODO: resend activation email
+ }
+ }
+ }
+ }
+
+
+ if(error.equals("")) {
+ ExternalPerson person = new ExternalPerson(firstName, lastName, email1, phone);
+ person.setAuthorized(true);
+ person.encryptPassword(password1);
+ //TODO: set authorized false
+ //TODO: make auth
+ //TODO: send activation email
+
+ self.solrSession.saveExternalPerson(person);
+
+ self.httpRequest.setAttribute("header", "Success!");
+ self.httpRequest.setAttribute("message", "You will receive an email shortly to activate your account, " +
+ "until then you will not be able to log in. If you do not receive an email or have any questions " +
+ "please <a href=\"http://www.nysenate.gov/contact\">contact us</a>.");
+ self.render("external/message.jsp");
+ }
+ else {
+ self.httpRequest.setAttribute("phone2", phone);
+ self.httpRequest.setAttribute("email", email1);
+ self.httpRequest.setAttribute("firstName", firstName);
+ self.httpRequest.setAttribute("lastName", lastName);
+
+ self.httpRequest.setAttribute("error", error);
+ self.render("external/register.jsp");
+
+ }
+
+ }
+
+ private void doExternalAuth(Request self) {
+
+ }
+
+ private void doExternalLogin(Request self) throws IOException, ServletException {
+
+ String cred = ((String)self.httpRequest.getParameter("name")).toLowerCase();
+ String pass = (String)self.httpRequest.getParameter("password");
+ ExternalPerson person = self.solrSession.loadExternalPersonByEmail(cred);
+
+ //check login correct
+ if(person != null && pass != null && person.checkPassword(pass)) {
+ self.httpSession.setAttribute("externalPerson", person.getFirstName());
+ self.httpSession.setAttribute("externalUid", person.getEmail());
+ self.redirect(urls.url("index"));
+ }
+ else {
+ self.httpRequest.setAttribute("errorMessage", "Username and/or password were incorrect. Are you sure you've <a href=\"" + urls.url("external","register") + "\">registered?</a>");
+ self.render("external/login.jsp");
+ }
+
+
+
+ }
+
public void doException(Request self, ExternalServletException e) throws ServletException, IOException {
System.out.println(e.getMessage());
e.printStackTrace();
@@ -79,8 +222,8 @@ public void doLogin(Request self) throws ExternalServletException, ServletExcept
//Otherwise, alert them that their combination was wrong and redirect them to try again
} else {
- self.httpRequest.setAttribute("errorMessage", "Username and/or password were incorrect.");
- self.render("/access.jsp");
+ self.httpRequest.setAttribute("errorMessage", "Username and/or password are incorrect.");
+ self.render("external/index.jsp");
}
//There is a small chance that a connection to LDAP is not available for some reason
@@ -91,13 +234,13 @@ public void doLogin(Request self) throws ExternalServletException, ServletExcept
//Alert the user to the situation
self.httpRequest.setAttribute("errorMessage", "The ldap server is down and you can't be authenticated. Please try again later.");
- self.render("access.jsp");
+ self.render("external/index.jsp");
}
//Person is not in our database
} else {
- self.httpRequest.setAttribute("errorMessage", "The user you have specified `"+cred+"` is not indexed in OpenDirectory.");
- self.render("access.jsp");
+ self.httpRequest.setAttribute("errorMessage", "Username and/or password were incorrect.");
+ self.render("external/index.jsp");
}
}
View
2 src/main/java/gov/nysenate/opendirectory/servlets/UserServlet.java
@@ -210,7 +210,7 @@ public void doLogin(Request self) throws UserServletException, ServletException,
//Person is not in our database
} else {
- self.httpRequest.setAttribute("errorMessage", "The user you have specified `"+cred+"` is not indexed in OpenDirectory.");
+ self.httpRequest.setAttribute("errorMessage", "Username and/or password were incorrect.");
self.render("login.jsp");
}
View
22 src/main/java/gov/nysenate/opendirectory/solr/SecureLoader.java
@@ -5,11 +5,13 @@
import org.apache.solr.common.SolrDocument;
+import gov.nysenate.opendirectory.models.ExternalPerson;
import gov.nysenate.opendirectory.models.Person;
+import gov.nysenate.opendirectory.models.interfaces.IPerson;
import gov.nysenate.opendirectory.utils.SerialUtils;
public class SecureLoader {
- private Person user;
+ private IPerson user;
private SolrSession session;
public static void main(String[] args) {
@@ -18,11 +20,27 @@ public static void main(String[] args) {
System.out.println("Done");
}
- public SecureLoader(Person user,SolrSession session) {
+ public SecureLoader(IPerson user,SolrSession session) {
this.user = user;
this.session = session;
}
+ public ExternalPerson loadExternalPerson(SolrDocument profile) {
+ ExternalPerson person = new ExternalPerson();
+
+ person.setEmail((String)profile.getFieldValue("uid"));
+ person.setFirstName((String)profile.getFieldValue("firstName"));
+ person.setLastName((String)profile.getFieldValue("lastName"));
+ person.setPhone((String)profile.getFieldValue("phone"));
+ person.setHash((String)profile.getFieldValue("hash"));
+ person.setAuthorized(new Boolean((String)profile.getFieldValue("authorized")));
+ person.setAuthorizationHash((String)profile.getFieldValue("authorizationHash"));
+
+ SerialUtils.loadStringSet((String)profile.getFieldValue("user_credential"),", ");
+
+ return person;
+ }
+
public Person loadPerson(SolrDocument profile) {
//Load up the person in a basic way
View
26 src/main/java/gov/nysenate/opendirectory/solr/SecureWriter.java
@@ -6,22 +6,42 @@
import org.apache.solr.common.SolrInputDocument;
+import gov.nysenate.opendirectory.models.ExternalPerson;
import gov.nysenate.opendirectory.models.Person;
+import gov.nysenate.opendirectory.models.interfaces.IPerson;
import gov.nysenate.opendirectory.utils.SerialUtils;
public class SecureWriter {
- Person user;
+ IPerson user;
SolrSession session;
public static void main(String[] args) {
-
+
}
- public SecureWriter(Person user, SolrSession session) {
+ public SecureWriter(IPerson user, SolrSession session) {
this.user = user;
this.session = session;
}
+
+ public SolrInputDocument writeExternalPerson(ExternalPerson person) {
+ SolrInputDocument doc = new SolrInputDocument();
+
+ doc.addField("otype","externalPerson", 1.0f);
+ doc.addField("uid", person.getEmail());
+ doc.addField("firstName", person.getFirstName());
+ doc.addField("lastName", person.getLastName());
+ doc.addField("phone", person.getPhone());
+ doc.addField("hash", person.getHash());
+ doc.addField("authorized", person.getAuthorized());
+ doc.addField("authorizationHash", person.getAuthorizationHash());
+
+ doc.addField("user_credential", SerialUtils.writeStringSet(person.getCredentials(),", "),1.0f);
+
+
+ return doc;
+ }
public SolrInputDocument writePerson(Person person) {
//Writes the person to a SolrDocument
View
3 src/main/java/gov/nysenate/opendirectory/solr/Solr.java
@@ -1,6 +1,7 @@
package gov.nysenate.opendirectory.solr;
import gov.nysenate.opendirectory.models.Person;
+import gov.nysenate.opendirectory.models.interfaces.IPerson;
import java.io.IOException;
import java.net.MalformedURLException;
@@ -47,7 +48,7 @@ public Solr connect() {
return null;
}
- public SolrSession newSession(Person user) {
+ public SolrSession newSession(IPerson user) {
return new SolrSession(user,this);
}
View
80 src/main/java/gov/nysenate/opendirectory/solr/SolrSession.java
@@ -13,13 +13,16 @@
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrDocumentList;
+import gov.nysenate.opendirectory.models.ExternalPerson;
import gov.nysenate.opendirectory.models.Person;
+import gov.nysenate.opendirectory.models.interfaces.IPerson;
+import gov.nysenate.opendirectory.utils.BCrypt;
import gov.nysenate.opendirectory.utils.SerialUtils;
public class SolrSession {
Solr solr;
- Person user;
+ IPerson user;
SecureLoader loader;
SecureWriter writer;
@@ -31,44 +34,35 @@
public static void main(String[] args) throws SolrServerException, IOException {
-// SolrSession solr = new SolrSession(Person.getAnon(),new Solr().connect());
-//
-// for(int i=0; i<10; i++)
-// solr.loadPeople();
-
Solr solr = new Solr().connect();
SolrSession session = solr.newSession(Person.getAdmin());
- Person p1 = session.loadPersonByUid("helpline");
-
- System.out.println(p1.getFullName());
-
- if(p1 == null) {
- System.out.println("oh!");
- }
-
-// session.loadPeopleByQuery("skills:(Drupal)");
-
-// Person p1 = session.loadPersonByUid("yee");
-// Person p2 = session.loadPersonByUid("hoppin");
-// Person p3 = session.loadPersonByUid("richard");
-//
-// p1.setSkills(new TreeSet<String>(Arrays.asList("Drupal, bluebird, crm, drupal, excel, facebook, html, new media, nysenate.gov, project management, social media, statistical analysis, twitter, video".split(", "))));
-// p2.setSkills(new TreeSet<String>(Arrays.asList("Drupal, Geographic Information Systems (GIS), Remove Sensing (satellite imagery), grassroots organizing, open source software, team building, web application functional design".split(", "))));
-// p3.setSkills(new TreeSet<String>(Arrays.asList("Apple, CSS, CSS3, Drupal, HTML, HTML5, PHP, Social Media".split(", "))));
-//
-// session.savePerson(p1);
-// session.savePerson(p2);
-// session.savePerson(p3);
}
- public SolrSession(Person user, Solr solr) {
+ public SolrSession(IPerson user, Solr solr) {
this.solr = solr;
this.user = user;
this.loader = new SecureLoader(user,this);
this.writer = new SecureWriter(user,this);
}
+ public ExternalPerson loadExternalPersonByEmail(String email) {
+ String query = "otype:externalPerson AND uid:" + email;
+ QueryResponse results = solr.query(query);
+ if(results == null)
+ return null;
+
+ SolrDocumentList profiles = results.getResults();
+ if(profiles == null || profiles.isEmpty())
+ return null;
+
+ ExternalPerson person = loader.loadExternalPerson(profiles.iterator().next());
+ if(!person.getEmail().equals(email))
+ return null;
+
+ return person;
+ }
+
public Person loadPersonByUid(String uid) {
//Do the query on the uid field
@@ -113,30 +107,30 @@ public Person loadPersonByUid(String uid) {
long start = System.nanoTime();
QueryResponse results = null;
- results = solr.sortedQuery(queryParser(query,creds, "(\"", "\")"), 2000, sortField, asc);
+ results = solr.sortedQuery(personQueryParser(query,creds, "(\"", "\")"), 2000, sortField, asc);
if(fuzz && (results == null || results.getResults().isEmpty())) {
- results = solr.sortedQuery(queryParser(
+ results = solr.sortedQuery(personQueryParser(
query,creds, "(", ")"), 2000, sortField, asc);
if(results == null || results.getResults().isEmpty()) {
Pattern pattern = Pattern.compile("(\\w+?):(\\w+?)(\\s(AND|OR)|$)");
Matcher matcher = pattern.matcher(query);
if(!matcher.find()) {
- results = solr.sortedQuery(queryParser(
+ results = solr.sortedQuery(personQueryParser(
query + "*",creds, "(", ")"), 2000, sortField, asc);
if(results == null || results.getResults().isEmpty()) {
- results = solr.sortedQuery(queryParser(
+ results = solr.sortedQuery(personQueryParser(
query + "~",creds, "(", ")"), 2000, sortField, asc);
}
}
else {
- results =solr.sortedQuery(queryParser(
+ results =solr.sortedQuery(personQueryParser(
matcher.replaceAll("$1:$2*$3"), creds, "(", ")"), 2000, sortField, asc);
if(results == null || results.getResults().isEmpty()) {
- results = solr.sortedQuery(queryParser(
+ results = solr.sortedQuery(personQueryParser(
matcher.replaceAll("$1:$2~$3"), creds, "(", ")"), 2000, sortField, asc);
}
}
@@ -167,6 +161,11 @@ public Person loadPersonByUid(String uid) {
}
+ public void saveExternalPerson(ExternalPerson person) throws SolrServerException, IOException {
+ addExternalPerson(person);
+ solr.server.commit();
+ }
+
public void savePerson(Person person) throws SolrServerException, IOException {
addPerson(person);
solr.server.commit();
@@ -204,19 +203,24 @@ public void deleteByUid(String uid) {
}
}
+ private void addExternalPerson(ExternalPerson person) throws SolrServerException, IOException {
+ solr.server.add(writer.writeExternalPerson(person));
+ }
+
private void addPerson(Person person) throws SolrServerException, IOException {
solr.server.add(writer.writePerson(person));
}
- public String queryParser(String query, String creds, String wrpL, String wrpR) {
+ public String personQueryParser(String query, String creds, String wrpL, String wrpR) {
creds = creds + "*";
String aon = "(?i:and|or|not)";
- TreeSet<String> basics = new TreeSet<String>(Arrays.asList("uid","otype","firstName","lastName","fullName"));
+ TreeSet<String> basics = new TreeSet<String>(Arrays.asList("uid","otype","firstName","lastName","fullName", "frontPage"));
Pattern p = Pattern.compile("(.*?)(\\w+):(\\(.+?\\)|\\[.+?\\]|.+?)([\\*~])?(\\s" + aon + "|" + aon + "\\s|\\s" + aon + "\\s|$)");
Matcher m = p.matcher(query);
if(m.find()) {
query ="";
+ for(int i = 0;i <= m.groupCount();i++) { System.out.println(i + ": " + m.group(i));}
do {
String quant = (m.group(4) != null && !m.group(4).equals("") ? m.group(4) : "");
boolean paren = (m.group(3).startsWith("(") ? false:true );
@@ -251,7 +255,7 @@ public String queryParser(String query, String creds, String wrpL, String wrpR)
" OR (email2:" + wrpL + query + wrpR + " AND email2_access:(" + creds + "))" +
" OR (phone2:" + wrpL + query + wrpR + " AND phone2_access:(" + creds + "))";
}
- System.out.println("\n\n\n" + query + "\n\n\n");
- return query;
+ System.out.println("otype:person AND " + query.replaceFirst("otype:.*?[\\s\\)\\]]", ""));
+ return "otype:person AND (" + query.replaceFirst("otype:.*?[\\s\\)\\]]", "") + ")";
}
}
View
752 src/main/java/gov/nysenate/opendirectory/utils/BCrypt.java
@@ -0,0 +1,752 @@
+package gov.nysenate.opendirectory.utils;
+
+// Copyright (c) 2006 Damien Miller <djm@mindrot.org>
+//
+// Permission to use, copy, modify, and distribute this software for any
+// purpose with or without fee is hereby granted, provided that the above
+// copyright notice and this permission notice appear in all copies.
+//
+// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+import java.io.UnsupportedEncodingException;
+
+import java.security.SecureRandom;
+
+/**
+ * BCrypt implements OpenBSD-style Blowfish password hashing using
+ * the scheme described in "A Future-Adaptable Password Scheme" by
+ * Niels Provos and David Mazieres.
+ * <p>
+ * This password hashing system tries to thwart off-line password
+ * cracking using a computationally-intensive hashing algorithm,
+ * based on Bruce Schneier's Blowfish cipher. The work factor of
+ * the algorithm is parameterised, so it can be increased as
+ * computers get faster.
+ * <p>
+ * Usage is really simple. To hash a password for the first time,
+ * call the hashpw method with a random salt, like this:
+ * <p>
+ * <code>
+ * String pw_hash = BCrypt.hashpw(plain_password, BCrypt.gensalt()); <br />
+ * </code>
+ * <p>
+ * To check whether a plaintext password matches one that has been
+ * hashed previously, use the checkpw method:
+ * <p>
+ * <code>
+ * if (BCrypt.checkpw(candidate_password, stored_hash))<br />
+ * &nbsp;&nbsp;&nbsp;&nbsp;System.out.println("It matches");<br />
+ * else<br />
+ * &nbsp;&nbsp;&nbsp;&nbsp;System.out.println("It does not match");<br />
+ * </code>
+ * <p>
+ * The gensalt() method takes an optional parameter (log_rounds)
+ * that determines the computational complexity of the hashing:
+ * <p>
+ * <code>
+ * String strong_salt = BCrypt.gensalt(10)<br />
+ * String stronger_salt = BCrypt.gensalt(12)<br />
+ * </code>
+ * <p>
+ * The amount of work increases exponentially (2**log_rounds), so
+ * each increment is twice as much work. The default log_rounds is
+ * 10, and the valid range is 4 to 31.
+ *
+ * @author Damien Miller
+ * @version 0.2
+ */
+public class BCrypt {
+ // BCrypt parameters
+ private static final int GENSALT_DEFAULT_LOG2_ROUNDS = 10;
+ private static final int BCRYPT_SALT_LEN = 16;
+
+ // Blowfish parameters
+ private static final int BLOWFISH_NUM_ROUNDS = 16;
+
+ // Initial contents of key schedule
+ private static final int P_orig[] = {
+ 0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344,
+ 0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89,
+ 0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
+ 0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917,
+ 0x9216d5d9, 0x8979fb1b
+ };
+ private static final int S_orig[] = {
+ 0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7,
+ 0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
+ 0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16,
+ 0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
+ 0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee,
+ 0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
+ 0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef,
+ 0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e,
+ 0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60,
+ 0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440,
+ 0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce,
+ 0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a,
+ 0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e,
+ 0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677,
+ 0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193,
+ 0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032,
+ 0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88,
+ 0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239,
+ 0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e,
+ 0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0,
+ 0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3,
+ 0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98,
+ 0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88,
+ 0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe,
+ 0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6,
+ 0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d,
+ 0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b,
+ 0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7,
+ 0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba,
+ 0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463,
+ 0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f,
+ 0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09,
+ 0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3,
+ 0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb,
+ 0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279,
+ 0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8,
+ 0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab,
+ 0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82,
+ 0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db,
+ 0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573,
+ 0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0,
+ 0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b,
+ 0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790,
+ 0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8,
+ 0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4,
+ 0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0,
+ 0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7,
+ 0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c,
+ 0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad,
+ 0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1,
+ 0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299,
+ 0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9,
+ 0x165fa266, 0x80957705, 0x93cc7314, 0x211a1477,
+ 0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf,
+ 0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49,
+ 0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af,
+ 0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa,
+ 0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5,
+ 0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41,
+ 0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
+ 0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400,
+ 0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915,
+ 0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664,
+ 0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a,
+ 0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623,
+ 0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266,
+ 0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1,
+ 0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e,
+ 0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6,
+ 0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
+ 0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e,
+ 0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1,
+ 0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737,
+ 0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8,
+ 0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff,
+ 0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd,
+ 0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701,
+ 0x3ae5e581, 0x37c2dadc, 0xc8b57634, 0x9af3dda7,
+ 0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41,
+ 0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331,
+ 0x4e548b38, 0x4f6db908, 0x6f420d03, 0xf60a04bf,
+ 0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af,
+ 0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e,
+ 0x5512721f, 0x2e6b7124, 0x501adde6, 0x9f84cd87,
+ 0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c,
+ 0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2,
+ 0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16,
+ 0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd,
+ 0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b,
+ 0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509,
+ 0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e,
+ 0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3,
+ 0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f,
+ 0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a,
+ 0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4,
+ 0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960,
+ 0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66,
+ 0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28,
+ 0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802,
+ 0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84,
+ 0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510,
+ 0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf,
+ 0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14,
+ 0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e,
+ 0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50,
+ 0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7,
+ 0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8,
+ 0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281,
+ 0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99,
+ 0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696,
+ 0xcdb30aeb, 0x532e3054, 0x8fd948e4, 0x6dbc3128,
+ 0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73,
+ 0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0,
+ 0x45eee2b6, 0xa3aaabea, 0xdb6c4f15, 0xfacb4fd0,
+ 0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105,
+ 0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250,
+ 0xcf62a1f2, 0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3,
+ 0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285,
+ 0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00,
+ 0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061,
+ 0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb,
+ 0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e,
+ 0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735,
+ 0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
+ 0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9,
+ 0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340,
+ 0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20,
+ 0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7,
+ 0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934,
+ 0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
+ 0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af,
+ 0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840,
+ 0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45,
+ 0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504,
+ 0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a,
+ 0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb,
+ 0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee,
+ 0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6,
+ 0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42,
+ 0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b,
+ 0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2,
+ 0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb,
+ 0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527,
+ 0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b,
+ 0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33,
+ 0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c,
+ 0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3,
+ 0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc,
+ 0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17,
+ 0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564,
+ 0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b,
+ 0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115,
+ 0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922,
+ 0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728,
+ 0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0,
+ 0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e,
+ 0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37,
+ 0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d,
+ 0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804,
+ 0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b,
+ 0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3,
+ 0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb,
+ 0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d,
+ 0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c,
+ 0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350,
+ 0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9,
+ 0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a,
+ 0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe,
+ 0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d,
+ 0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc,
+ 0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f,
+ 0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61,
+ 0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2,
+ 0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9,
+ 0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2,
+ 0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c,
+ 0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e,
+ 0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633,
+ 0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10,
+ 0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169,
+ 0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52,
+ 0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027,
+ 0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5,
+ 0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62,
+ 0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634,
+ 0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76,
+ 0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24,
+ 0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc,
+ 0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4,
+ 0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c,
+ 0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837,
+ 0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0,
+ 0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b,
+ 0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe,
+ 0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b,
+ 0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4,
+ 0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8,
+ 0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6,
+ 0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304,
+ 0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22,
+ 0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4,
+ 0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6,
+ 0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9,
+ 0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59,
+ 0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593,
+ 0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51,
+ 0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28,
+ 0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c,
+ 0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b,
+ 0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28,
+ 0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c,
+ 0x15056dd4, 0x88f46dba, 0x03a16125, 0x0564f0bd,
+ 0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a,
+ 0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319,
+ 0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb,
+ 0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f,
+ 0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991,
+ 0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32,
+ 0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680,
+ 0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166,
+ 0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae,
+ 0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb,
+ 0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5,
+ 0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47,
+ 0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370,
+ 0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d,
+ 0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84,
+ 0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048,
+ 0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8,
+ 0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd,
+ 0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9,
+ 0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7,
+ 0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38,
+ 0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f,
+ 0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c,
+ 0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525,
+ 0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1,
+ 0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442,
+ 0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964,
+ 0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e,
+ 0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8,
+ 0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d,
+ 0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f,
+ 0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299,
+ 0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02,
+ 0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc,
+ 0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614,
+ 0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a,
+ 0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6,
+ 0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b,
+ 0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0,
+ 0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060,
+ 0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e,
+ 0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9,
+ 0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f,
+ 0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6
+ };
+
+ // bcrypt IV: "OrpheanBeholderScryDoubt"
+ static private final int bf_crypt_ciphertext[] = {
+ 0x4f727068, 0x65616e42, 0x65686f6c,
+ 0x64657253, 0x63727944, 0x6f756274
+ };
+
+ // Table for Base64 encoding
+ static private final char base64_code[] = {
+ '.', '/', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
+ 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V',
+ 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h',
+ 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't',
+ 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5',
+ '6', '7', '8', '9'
+ };
+
+ // Table for Base64 decoding
+ static private final byte index_64[] = {
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 0, 1, 54, 55,
+ 56, 57, 58, 59, 60, 61, 62, 63, -1, -1,
+ -1, -1, -1, -1, -1, 2, 3, 4, 5, 6,
+ 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
+ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
+ -1, -1, -1, -1, -1, -1, 28, 29, 30,
+ 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
+ 51, 52, 53, -1, -1, -1, -1, -1
+ };
+
+ // Expanded Blowfish key
+ private int P[];
+ private int S[];
+
+ /**
+ * Encode a byte array using bcrypt's slightly-modified base64
+ * encoding scheme. Note that this is *not* compatible with
+ * the standard MIME-base64 encoding.
+ *
+ * @param d the byte array to encode
+ * @param len the number of bytes to encode
+ * @return base64-encoded string
+ * @exception IllegalArgumentException if the length is invalid
+ */
+ private static String encode_base64(byte d[], int len)
+ throws IllegalArgumentException {
+ int off = 0;
+ StringBuffer rs = new StringBuffer();
+ int c1, c2;
+
+ if (len <= 0 || len > d.length)
+ throw new IllegalArgumentException ("Invalid len");
+
+ while (off < len) {
+ c1 = d[off++] & 0xff;
+ rs.append(base64_code[(c1 >> 2) & 0x3f]);
+ c1 = (c1 & 0x03) << 4;
+ if (off >= len) {
+ rs.append(base64_code[c1 & 0x3f]);
+ break;
+ }
+ c2 = d[off++] & 0xff;
+ c1 |= (c2 >> 4) & 0x0f;
+ rs.append(base64_code[c1 & 0x3f]);
+ c1 = (c2 & 0x0f) << 2;
+ if (off >= len) {
+ rs.append(base64_code[c1 & 0x3f]);
+ break;
+ }
+ c2 = d[off++] & 0xff;
+ c1 |= (c2 >> 6) & 0x03;
+ rs.append(base64_code[c1 & 0x3f]);
+ rs.append(base64_code[c2 & 0x3f]);
+ }
+ return rs.toString();
+ }
+
+ /**
+ * Look up the 3 bits base64-encoded by the specified character,
+ * range-checking againt conversion table
+ * @param x the base64-encoded value
+ * @return the decoded value of x
+ */
+ private static byte char64(char x) {
+ if ((int)x < 0 || (int)x > index_64.length)
+ return -1;
+ return index_64[(int)x];
+ }
+
+ /**
+ * Decode a string encoded using bcrypt's base64 scheme to a
+ * byte array. Note that this is *not* compatible with
+ * the standard MIME-base64 encoding.
+ * @param s the string to decode
+ * @param maxolen the maximum number of bytes to decode
+ * @return an array containing the decoded bytes
+ * @throws IllegalArgumentException if maxolen is invalid
+ */
+ private static byte[] decode_base64(String s, int maxolen)
+ throws IllegalArgumentException {
+ StringBuffer rs = new StringBuffer();
+ int off = 0, slen = s.length(), olen = 0;
+ byte ret[];
+ byte c1, c2, c3, c4, o;
+
+ if (maxolen <= 0)
+ throw new IllegalArgumentException ("Invalid maxolen");
+
+ while (off < slen - 1 && olen < maxolen) {
+ c1 = char64(s.charAt(off++));
+ c2 = char64(s.charAt(off++));
+ if (c1 == -1 || c2 == -1)
+ break;
+ o = (byte)(c1 << 2);
+ o |= (c2 & 0x30) >> 4;
+ rs.append((char)o);
+ if (++olen >= maxolen || off >= slen)
+ break;
+ c3 = char64(s.charAt(off++));
+ if (c3 == -1)
+ break;
+ o = (byte)((c2 & 0x0f) << 4);
+ o |= (c3 & 0x3c) >> 2;
+ rs.append((char)o);
+ if (++olen >= maxolen || off >= slen)
+ break;
+ c4 = char64(s.charAt(off++));
+ o = (byte)((c3 & 0x03) << 6);
+ o |= c4;
+ rs.append((char)o);
+ ++olen;
+ }
+
+ ret = new byte[olen];
+ for (off = 0; off < olen; off++)
+ ret[off] = (byte)rs.charAt(off);
+ return ret;
+ }
+
+ /**
+ * Blowfish encipher a single 64-bit block encoded as
+ * two 32-bit halves
+ * @param lr an array containing the two 32-bit half blocks
+ * @param off the position in the array of the blocks
+ */
+ private final void encipher(int lr[], int off) {
+ int i, n, l = lr[off], r = lr[off + 1];
+
+ l ^= P[0];
+ for (i = 0; i <= BLOWFISH_NUM_ROUNDS - 2;) {
+ // Feistel substitution on left word
+ n = S[(l >> 24) & 0xff];
+ n += S[0x100 | ((l >> 16) & 0xff)];
+ n ^= S[0x200 | ((l >> 8) & 0xff)];
+ n += S[0x300 | (l & 0xff)];
+ r ^= n ^ P[++i];
+
+ // Feistel substitution on right word
+ n = S[(r >> 24) & 0xff];
+ n += S[0x100 | ((r >> 16) & 0xff)];
+ n ^= S[0x200 | ((r >> 8) & 0xff)];
+ n += S[0x300 | (r & 0xff)];
+ l ^= n ^ P[++i];
+ }
+ lr[off] = r ^ P[BLOWFISH_NUM_ROUNDS + 1];
+ lr[off + 1] = l;
+ }
+
+ /**
+ * Cycically extract a word of key material
+ * @param data the string to extract the data from
+ * @param offp a "pointer" (as a one-entry array) to the
+ * current offset into data
+ * @return the next word of material from data
+ */
+ private static int streamtoword(byte data[], int offp[]) {
+ int i;
+ int word = 0;
+ int off = offp[0];
+
+ for (i = 0; i < 4; i++) {
+ word = (word << 8) | (data[off] & 0xff);
+ off = (off + 1) % data.length;
+ }
+
+ offp[0] = off;
+ return word;
+ }
+
+ /**
+ * Initialise the Blowfish key schedule
+ */
+ private void init_key() {
+ P = (int[])P_orig.clone();
+ S = (int[])S_orig.clone();
+ }
+
+ /**
+ * Key the Blowfish cipher
+ * @param key an array containing the key
+ */
+ private void key(byte key[]) {
+ int i;
+ int koffp[] = { 0 };
+ int lr[] = { 0, 0 };
+ int plen = P.length, slen = S.length;
+
+ for (i = 0; i < plen; i++)
+ P[i] = P[i] ^ streamtoword(key, koffp);
+
+ for (i = 0; i < plen; i += 2) {
+ encipher(lr, 0);
+ P[i] = lr[0];
+ P[i + 1] = lr[1];
+ }
+
+ for (i = 0; i < slen; i += 2) {
+ encipher(lr, 0);
+ S[i] = lr[0];
+ S[i + 1] = lr[1];
+ }
+ }
+
+ /**
+ * Perform the "enhanced key schedule" step described by
+ * Provos and Mazieres in "A Future-Adaptable Password Scheme"
+ * http://www.openbsd.org/papers/bcrypt-paper.ps
+ * @param data salt information
+ * @param key password information
+ */
+ private void ekskey(byte data[], byte key[]) {
+ int i;
+ int koffp[] = { 0 }, doffp[] = { 0 };
+ int lr[] = { 0, 0 };
+ int plen = P.length, slen = S.length;
+
+ for (i = 0; i < plen; i++)
+ P[i] = P[i] ^ streamtoword(key, koffp);
+
+ for (i = 0; i < plen; i += 2) {
+ lr[0] ^= streamtoword(data, doffp);
+ lr[1] ^= streamtoword(data, doffp);
+ encipher(lr, 0);
+ P[i] = lr[0];
+ P[i + 1] = lr[1];
+ }
+
+ for (i = 0; i < slen; i += 2) {
+ lr[0] ^= streamtoword(data, doffp);
+ lr[1] ^= streamtoword(data, doffp);
+ encipher(lr, 0);
+ S[i] = lr[0];
+ S[i + 1] = lr[1];
+ }
+ }
+
+ /**
+ * Perform the central password hashing step in the
+ * bcrypt scheme
+ * @param password the password to hash
+ * @param salt the binary salt to hash with the password
+ * @param log_rounds the binary logarithm of the number
+ * of rounds of hashing to apply
+ * @return an array containing the binary hashed password
+ */
+ private byte[] crypt_raw(byte password[], byte salt[], int log_rounds) {
+ int rounds, i, j;
+ int cdata[] = (int[])bf_crypt_ciphertext.clone();
+ int clen = cdata.length;
+ byte ret[];
+
+ if (log_rounds < 4 || log_rounds > 31)
+ throw new IllegalArgumentException ("Bad number of rounds");
+ rounds = 1 << log_rounds;
+ if (salt.length != BCRYPT_SALT_LEN)
+ throw new IllegalArgumentException ("Bad salt length");
+
+ init_key();
+ ekskey(salt, password);
+ for (i = 0; i < rounds; i++) {
+ key(password);
+ key(salt);
+ }
+
+ for (i = 0; i < 64; i++) {
+ for (j = 0; j < (clen >> 1); j++)
+ encipher(cdata, j << 1);
+ }
+
+ ret = new byte[clen * 4];
+ for (i = 0, j = 0; i < clen; i++) {
+ ret[j++] = (byte)((cdata[i] >> 24) & 0xff);
+ ret[j++] = (byte)((cdata[i] >> 16) & 0xff);
+ ret[j++] = (byte)((cdata[i] >> 8) & 0xff);
+ ret[j++] = (byte)(cdata[i] & 0xff);
+ }
+ return ret;
+ }
+
+ /**
+ * Hash a password using the OpenBSD bcrypt scheme
+ * @param password the password to hash
+ * @param salt the salt to hash with (perhaps generated
+ * using BCrypt.gensalt)
+ * @return the hashed password
+ */
+ public static String hashpw(String password, String salt) {
+ BCrypt B;
+ String real_salt;
+ byte passwordb[], saltb[], hashed[];
+ char minor = (char)0;
+ int rounds, off = 0;
+ StringBuffer rs = new StringBuffer();
+
+ if (salt.charAt(0) != '$' || salt.charAt(1) != '2')
+ throw new IllegalArgumentException ("Invalid salt version");
+ if (salt.charAt(2) == '$')
+ off = 3;
+ else {
+ minor = salt.charAt(2);
+ if (minor != 'a' || salt.charAt(3) != '$')
+ throw new IllegalArgumentException ("Invalid salt revision");
+ off = 4;
+ }
+
+ // Extract number of rounds
+ if (salt.charAt(off + 2) > '$')
+ throw new IllegalArgumentException ("Missing salt rounds");
+ rounds = Integer.parseInt(salt.substring(off, off + 2));
+
+ real_salt = salt.substring(off + 3, off + 25);
+ try {
+ passwordb = (password + (minor >= 'a' ? "\000" : "")).getBytes("UTF-8");
+ } catch (UnsupportedEncodingException uee) {
+ throw new AssertionError("UTF-8 is not supported");
+ }
+
+ saltb = decode_base64(real_salt, BCRYPT_SALT_LEN);
+
+ B = new BCrypt();
+ hashed = B.crypt_raw(passwordb, saltb, rounds);
+
+ rs.append("$2");
+ if (minor >= 'a')
+ rs.append(minor);
+ rs.append("$");
+ if (rounds < 10)
+ rs.append("0");
+ rs.append(Integer.toString(rounds));
+ rs.append("$");
+ rs.append(encode_base64(saltb, saltb.length));
+ rs.append(encode_base64(hashed,
+ bf_crypt_ciphertext.length * 4 - 1));
+ return rs.toString();
+ }
+
+ /**
+ * Generate a salt for use with the BCrypt.hashpw() method
+ * @param log_rounds the log2 of the number of rounds of
+ * hashing to apply - the work factor therefore increases as
+ * 2**log_rounds.
+ * @param random an instance of SecureRandom to use
+ * @return an encoded salt value
+ */
+ public static String gensalt(int log_rounds, SecureRandom random) {
+ StringBuffer rs = new StringBuffer();
+ byte rnd[] = new byte[BCRYPT_SALT_LEN];
+
+ random.nextBytes(rnd);
+
+ rs.append("$2a$");
+ if (log_rounds < 10)
+ rs.append("0");
+ rs.append(Integer.toString(log_rounds));
+ rs.append("$");
+ rs.append(encode_base64(rnd, rnd.length));
+ return rs.toString();
+ }
+
+ /**
+ * Generate a salt for use with the BCrypt.hashpw() method
+ * @param log_rounds the log2 of the number of rounds of
+ * hashing to apply - the work factor therefore increases as
+ * 2**log_rounds.
+ * @return an encoded salt value
+ */
+ public static String gensalt(int log_rounds) {
+ return gensalt(log_rounds, new SecureRandom());
+ }
+
+ /**
+ * Generate a salt for use with the BCrypt.hashpw() method,
+ * selecting a reasonable default for the number of hashing
+ * rounds to apply
+ * @return an encoded salt value
+ */
+ public static String gensalt() {
+ return gensalt(GENSALT_DEFAULT_LOG2_ROUNDS);
+ }
+
+ /**
+ * Check that a plaintext password matches a previously hashed
+ * one
+ * @param plaintext the plaintext password to verify
+ * @param hashed the previously-hashed password
+ * @return true if the passwords match, false otherwise
+ */
+ public static boolean checkpw(String plaintext, String hashed) {
+ return (hashed.compareTo(hashpw(plaintext, hashed)) == 0);
+ }
+}
View
17 src/main/java/gov/nysenate/opendirectory/utils/Request.java
@@ -38,11 +38,22 @@ public Request(BaseServlet servlet, HttpServletRequest request,HttpServletRespon
httpSession.setAttribute("uid", null);
}
- //If no user was specified/found, log them as the Anonymous user.
- if( user == null)
+ String externalPerson = (String)httpSession.getAttribute("externalPerson");
+ if(externalPerson != null) {
+ uid = (String)httpSession.getAttribute("externalPersonUid");
user = Person.getAnon();
+ solrSession = servlet.solrServer.newSession(
+ servlet.solrServer.newSession(Person.getAdmin()).loadExternalPersonByEmail(uid));
+ }
+ else {
+ if( user == null)
+ user = Person.getAnon();
+
+ solrSession = servlet.solrServer.newSession(user);
+ }
+
+ //If no user was specified/found, log them as the Anonymous user.
- solrSession = servlet.solrServer.newSession(user);
//Set up request defaults
request.setAttribute("title", "NYSS OpenDirectory");
View
7 src/main/webapp/css/application.css
@@ -778,6 +778,13 @@ a.people_url:hover {
line-height: 23px;
}
+#external_input {
+ width: 70px;
+ text-align: left;
+ margin-right: 50px;
+ line-height: 23px;
+}
+
#edit_form_field ol {
list-style: none;
margin: 0;
View
15 src/main/webapp/js/external.js
@@ -0,0 +1,15 @@
+$(document).ready( function() {
+
+ $('input[name=phone2]').focus(function() {
+ if($(this).val() == '(###) ###-####') {
+ $(this).val('');
+ }
+ });
+
+ $('input[name=phone2]').blur(function() {
+ if($(this).val() == '') {
+ $(this).val('(###) ###-####');
+ }
+ });
+});
+
View
2 src/main/webapp/jsp/about.jsp
@@ -6,6 +6,8 @@
<div id="main">
<h2 style="margin-left:30px;">About OpenDirectory</h2>
<div class="about">
+ <object width="425" height="344"><param name="movie" value="http://www.youtube.com/v/y-pe46B1vmw?hl=en&fs=1"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><embed src="http://www.youtube.com/v/y-pe46B1vmw?hl=en&fs=1" type="application/x-shockwave-flash" allowscriptaccess="always" allowfullscreen="true" width="425" height="344"></embed></object>
+ <br/><br/>
OpenDirectory is a new way of finding the people you're looking for who work for the New York
State Senate. With a profile for every employee, OpenDirectory automatically displays name,
title, office/department, and work contact information within an online, searchable website.
View
5 src/main/webapp/jsp/external/footer.jsp
@@ -0,0 +1,5 @@
+ <div id="footer">
+ </div>
+ </div>
+ </body>
+</html>
View
26 src/main/webapp/jsp/external/header.jsp
@@ -0,0 +1,26 @@
+<%@ page language="java" import="gov.nysenate.opendirectory.models.Person,gov.nysenate.opendirectory.utils.UrlMapper" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%><%
+ UrlMapper urls = (UrlMapper)request.getAttribute("urls");
+%>
+<!DOCTYPE html>
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <title>NYSS OpenDirectory</title>
+ <link rel="stylesheet" type="text/css" href="<%=urls.url("css","application.css")%>" />
+ <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
+ <script type="text/javascript" src="<%=urls.url("js","external.js")%>"></script>
+ </head>
+ <body>
+ <div id="page">
+ <div id="header">
+ <a href="http://www.nysenate.gov">
+ <img src="http://www.nysenate.gov/sites/all/themes/nys/images/nyss_logo.png" id="logo" />
+ </a>
+ </div>
+ <div id="nav_bar">
+ Not a Senate user?
+ <ul>
+ <li><a href="<%=urls.url("external","login")%>" class="nav">Login</a><div class="sep">or</div></li>
+ <li><a href="<%=urls.url("external","register")%>" class="nav">Register</a></li>
+ </ul>
+ </div>
View
27 src/main/webapp/jsp/access.jsp → src/main/webapp/jsp/external/index.jsp
@@ -5,23 +5,7 @@
String title = (String)request.getAttribute("title");
%>
-<!DOCTYPE html>
-<html>
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=title%></title>
- <link rel="stylesheet" type="text/css" href="<%=urls.url("css","application.css")%>" />
- <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
- </head>
- <body>
- <div id="page">
- <div id="header">
- <a href="http://www.nysenate.gov">
- <img src="http://www.nysenate.gov/sites/all/themes/nys/images/nyss_logo.png" id="logo" />
- </a>
- </div>
- <div id="nav_bar">
- </div>
+<jsp:include page="header.jsp" />
<div id="main" style="margin-top:50px;">
<h2 style="margin-left:30px;">Access OpenDirectory from outside the Senate network</h2>
<div id="main_center">
@@ -33,7 +17,7 @@
<% } %>
<div id="edit_form_field">
- <form action="<%=urls.url("external","login")%>" method="POST">
+ <form action="<%=urls.url("external")%>" method="POST">
<ol>
<li>
<label for="login_name">Username:</label>
@@ -49,8 +33,5 @@
</div>
</div>
</div>
- <div id="footer">
- </div>
- </div>
- </body>
-</html>
+<jsp:include page="footer.jsp" />
+
View
37 src/main/webapp/jsp/external/login.jsp
@@ -0,0 +1,37 @@
+<%@ page language="java" import="gov.nysenate.opendirectory.models.Person,gov.nysenate.opendirectory.utils.UrlMapper" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%><%
+ UrlMapper urls = (UrlMapper)request.getAttribute("urls");
+ String error_message = (String)request.getAttribute("errorMessage");
+ Person user = (Person)request.getAttribute("user");
+ String title = (String)request.getAttribute("title");
+
+%>
+<jsp:include page="header.jsp" />
+ <div id="main" style="margin-top:50px;">
+ <h2 style="margin-left:30px;">Access to OpenDirectory for non Senate Government Employees</h2>
+ <div id="main_center">
+ <% if(error_message != null) { %>
+ <div id="error">
+ <%=error_message %>
+ <br></br>
+ </div>
+ <% } %>
+
+ <div id="edit_form_field">
+ <form action="" method="POST">
+ <ol>
+ <li>
+ <label for="login_name">Username:</label>
+ <input type="text" name="name" size="31" maxlength="255" value="" id="login_name"/>
+ </li>
+ <li>
+ <label for="login_pword">Password:</label>
+ <input type="password" name="password" size="31" maxlength="255" value="" id="login_pword"/>
+ </li>
+ </ol>
+ <input type="submit" value="Login" id="login_button"></input>
+ </form>
+ </div>
+ </div>
+ </div>
+<jsp:include page="footer.jsp" />
+
View
30 src/main/webapp/jsp/external/message.jsp
@@ -0,0 +1,30 @@
+<%@ page language="java" import="gov.nysenate.opendirectory.models.Person,gov.nysenate.opendirectory.utils.UrlMapper" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%><%
+ UrlMapper urls = (UrlMapper)request.getAttribute("urls");
+ String error = (String)request.getAttribute("error");
+ String message = (String)request.getAttribute("message");
+ String header = (String)request.getAttribute("header");
+
+
+%>
+<jsp:include page="header.jsp" />
+ <div id="main" style="margin-top:50px;">
+ <h2 style="margin-left:30px;"><%=header %></h2>
+ <div id="main_center">
+ <br/><br/>
+ <% if(error != null) { %>
+ <div id="error">
+ <%=error %>
+ <br></br>
+ </div>
+ <% } %>
+ <% if(message != null) { %>
+ <div style="margin-left:30px;">
+ <%=message %>
+ </div>
+ <br></br>
+ <% } %>
+
+ </div>
+ </div>
+<jsp:include page="footer.jsp" />
+
View
67 src/main/webapp/jsp/external/register.jsp
@@ -0,0 +1,67 @@
+<%@ page language="java" import="gov.nysenate.opendirectory.models.Person,gov.nysenate.opendirectory.utils.UrlMapper" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%><%
+ UrlMapper urls = (UrlMapper)request.getAttribute("urls");
+ String error_message = (String)request.getAttribute("errorMessage");
+ String error = (String)request.getAttribute("error");
+ String phone = (String)request.getAttribute("phone2");
+ String email = (String)request.getAttribute("email");
+ String firstName = (String)request.getAttribute("firstName");
+ String lastName = (String)request.getAttribute("lastName");
+
+
+%>
+<jsp:include page="header.jsp" />
+ <div id="main" style="margin-top:50px;">
+ <div id="edit_error" style="font-size:85%; width:60%; display:<%=error!= null ? "inherit" : "none" %>;"><%= error!=null ? "It looks like there may be a problem with one of your contactfields. <br/>Please check to make sure you:<br/>" + error:"" %></div>
+
+ <h2 style="margin-left:30px;">Register to access OpenDirectory</h2>
+ <div id="main_center">
+ <i>Note that this is currently only available to users with an email address ending in state.ny.us or ny.gov</i>
+ <br/>
+ <i>All fields required</i>
+ <br/><br/>
+ <% if(error_message != null) { %>
+ <div id="error">
+ <%=error_message %>
+ <br></br>
+ </div>
+ <% } %>
+ <div id="edit_container" style="margin:auto;">
+ <div id="edit_form_field" > <!-- style="float:left" -->
+ <form action="" method="POST">
+ <ol>
+ <li>
+ <label id="external_input">Email</label>
+ <input style="margin-left:34px;" value="<%=email != null ? email : "" %>" type="text" name="email1" size="31" maxlength="255" value=""/>
+ </li>
+ <li>
+ <label id="external_input">Verify Email</label>
+ <input style="margin-left:-11px;" value="" type="text" name="email2" size="31" maxlength="255" value=""/>
+ </li>
+ <li>
+ <label id="external_input">First Name</label>
+ <input style="margin-left:-3px;" value="<%=firstName != null ? firstName : "" %>" type="text" name="firstName" size="31" maxlength="255" value=""/>
+ </li>
+ <li>
+ <label id="external_input">Last Name</label>
+ <input style="margin-left:-2px;" value="<%=lastName != null ? lastName : "" %>" type="text" name="lastName" size="31" maxlength="255" value=""/>
+ </li>
+ <li>
+ <label id="external_input">Phone</label>
+ <input value="<%= phone != null ? phone : "(###) ###-####" %>" style="margin-left:30px;" type="text" name="phone2" size="31" maxlength="255" value=""/>
+ </li>
+ <li>
+ <label id="external_input">Password</label>
+ <input style="margin-left:6px;" type="password" name="pword1" size="31" maxlength="255" value=""/>
+ </li>
+ <li>
+ <label id="external_input">Verify Password</label>
+ <input style="margin-left:-39px;" type="password" name="pword2" size="31" maxlength="255" value=""/>
+ </li>
+ </ol>
+ <input type="submit" value="Register" id="submit_button"></input>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+<jsp:include page="footer.jsp" />
View
2 src/main/webapp/jsp/faq.jsp
@@ -8,6 +8,8 @@
<h2 style="margin-left:30px;">Open Directory FAQ</h2>
<div style="margin-left:30px;">
+ <object width="425" height="344"><param name="movie" value="http://www.youtube.com/v/y-pe46B1vmw?hl=en&fs=1"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><embed src="http://www.youtube.com/v/y-pe46B1vmw?hl=en&fs=1" type="application/x-shockwave-flash" allowscriptaccess="always" allowfullscreen="true" width="425" height="344"></embed></object>
+ <br/><br/>
<ol>
<li><a href="#faq_what">What should I put on my profile?</a></li>
<li><a href="#faq_login">What's my username and password?</a></li>
View
19 src/main/webapp/jsp/header.jsp
@@ -2,16 +2,13 @@
UrlMapper urls = (UrlMapper)request.getAttribute("urls");
Person user = (Person)request.getAttribute("user");
String title = (String)request.getAttribute("title");
+ String externalPerson = (String)session.getAttribute("externalPerson");
%><!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title><%=title%></title>
- <link rel="stylesheet" type="text/css" href="<%=urls.url("css","application.css")%>" />
- <!-- <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script> -->
- <!-- <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.1/jquery.min.js"></script> -->
- <!-- <script src="http://cdn.jquerytools.org/1.2.5/tiny/jquery.tools.min.js"></script> -->
-
+ <link rel="stylesheet" type="text/css" href="<%=urls.url("css","application.css")%>" />
<script type="text/javascript" src="<%=urls.url("js","jquery.tools.min.js")%>"></script>
<script type="text/javascript" src="<%=urls.url("js","application.js")%>"></script>
<script type="text/javascript" src="<%=urls.url("js","search-preview.js")%>"></script>
@@ -27,12 +24,13 @@
</a>
<div id="user_box">
- <% if (user == null) { %>
+ <% if (externalPerson != null) { %>
<ul id="user_top_bar">
- <li><a href="<%=urls.url("user","login")%>">LOGIN</a></li>
+ <li id="welcome">Welcome, <%=externalPerson%></li>
+ <li><a href="<%=urls.url("external","logout")%>">LOGOUT</a></li>
<li><a href="<%=urls.url("index")%>">DIRECTORY HOME</a></li>
</ul>
- <% } else { %>
+ <% } else if(user != null) { %>
<ul id="user_top_bar">
<li id="welcome">Welcome, <%=user.getFirstName()%></li>
<li><a href="<%=urls.url("user","logout")%>">LOGOUT</a></li>
@@ -44,6 +42,11 @@
<li><a href="<%=urls.url("user","bookmarks")%>">My Bookmarks</a></li>
<li><a href="<%=urls.url("user","edit")%>">Edit Profile</a></li>
</ul>
+ <% } else { %>
+ <ul id="user_top_bar">
+ <li><a href="<%=urls.url("user","login")%>">LOGIN</a></li>
+ <li><a href="<%=urls.url("index")%>">DIRECTORY HOME</a></li>
+ </ul>
<% } %>
</div>
</div>

0 comments on commit 723f49a

Please sign in to comment.