github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

added pairwise identifier service and repository

pull/516/head
Justin Richer 2013-09-10 17:15:58 -04:00
parent bdf62eaa36
commit dbdc2e777d
8 changed files with 347 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
openid-connect-common/src/main/java/org/mitre/openid/connect/model/PairwiseIdentifier.java Normal file
View File

@ -0,0 +1,118 @@
/**
*
*/
package org.mitre.openid.connect.model;
import javax.persistence.Basic;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
/**
*
* Holds the generated pairwise identifiers for a user. Can be tied to either a client ID or a sector identifier URL.
*
* @author jricher
*
*/
@Entity
@Table(name = "pairwise_identifier")
@NamedQueries({
@NamedQuery(name="PairwiseIdentifier.getAll", query = "select p from PairwiseIdentifier p"),
@NamedQuery(name="PairwiseIdentifier.getByClientId", query = "select p from PairwiseIdentifier p WHERE p.userSub = :sub AND p.clientId = :clientId"),
@NamedQuery(name="PairwiseIdentifier.getBySectorIdentifier", query = "select p from PairwiseIdentifier p WHERE p.userSub = :sub AND p.sectorIdentifier = :sectorIdentifier")
})
public class PairwiseIdentifier {
private Long id;
private String identifier;
private String userSub;
private String clientId;
private String sectorIdentifier;
/**
* @return the id
*/
@Id
@GeneratedValue(strategy=GenerationType.IDENTITY)
@Column(name = "id")
public Long getId() {
return id;
}
/**
* @param id the id to set
*/
public void setId(Long id) {
this.id = id;
}
/**
* @return the identifier
*/
@Basic
@Column(name = "identifier")
public String getIdentifier() {
return identifier;
}
/**
* @param identifier the identifier to set
*/
public void setIdentifier(String identifier) {
this.identifier = identifier;
}
/**
* @return the userSub
*/
@Basic
@Column(name = "sub")
public String getUserSub() {
return userSub;
}
/**
* @param userSub the userSub to set
*/
public void setUserSub(String userSub) {
this.userSub = userSub;
}
/**
* @return the clientId
*/
@Basic
@Column(name = "client_id")
public String getClientId() {
return clientId;
}
/**
* @param clientId the clientId to set
*/
public void setClientId(String clientId) {
this.clientId = clientId;
}
/**
* @return the sectorIdentifier
*/
@Basic
@Column(name = "sector_identifier")
public String getSectorIdentifier() {
return sectorIdentifier;
}
/**
* @param sectorIdentifier the sectorIdentifier to set
*/
public void setSectorIdentifier(String sectorIdentifier) {
this.sectorIdentifier = sectorIdentifier;
}
}

39
openid-connect-common/src/main/java/org/mitre/openid/connect/repository/PairwiseIdentifierRepository.java Normal file
View File

@ -0,0 +1,39 @@
/**
*
*/
package org.mitre.openid.connect.repository;
import org.mitre.openid.connect.model.PairwiseIdentifier;
/**
* @author jricher
*
*/
public interface PairwiseIdentifierRepository {
/**
* Get a pairwise identifier by its associated user subject and sector identifier.
*
* @param sub
* @param sectorIdentifierUri
* @return
*/
public PairwiseIdentifier getBySectorIdentifier(String sub, String sectorIdentifierUri);
/**
* Get a pairwise identifier by its associated user subject and client id.
*
* @param sub
* @param clientId
* @return
*/
public PairwiseIdentifier getByClientId(String sub, String clientId);
/**
* Save a pairwise identifier to the database.
*
* @param pairwise
*/
public void save(PairwiseIdentifier pairwise);
}

22
openid-connect-common/src/main/java/org/mitre/openid/connect/service/PairwiseIdentiferService.java Normal file
View File

@ -0,0 +1,22 @@
/**
*
*/
package org.mitre.openid.connect.service;
import org.mitre.oauth2.model.ClientDetailsEntity;
import org.mitre.openid.connect.model.UserInfo;
/**
* @author jricher
*
*/
public interface PairwiseIdentiferService {
/**
* @param userInfo
* @param client
* @return
*/
public String getIdentifier(UserInfo userInfo, ClientDetailsEntity client);
}

61
openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaPairwiseIdentifierRepository.java Normal file
View File

@ -0,0 +1,61 @@
/**
*
*/
package org.mitre.openid.connect.repository.impl;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.TypedQuery;
import org.mitre.openid.connect.model.PairwiseIdentifier;
import org.mitre.openid.connect.repository.PairwiseIdentifierRepository;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;
import static org.mitre.util.jpa.JpaUtil.getSingleResult;
import static org.mitre.util.jpa.JpaUtil.saveOrUpdate;
/**
* @author jricher
*
*/
@Repository
public class JpaPairwiseIdentifierRepository implements PairwiseIdentifierRepository {
@PersistenceContext
private EntityManager manager;
/* (non-Javadoc)
* @see org.mitre.openid.connect.repository.PairwiseIdentifierRepository#getBySectorIdentifier(java.lang.String, java.lang.String)
*/
@Override
public PairwiseIdentifier getBySectorIdentifier(String sub, String sectorIdentifierUri) {
TypedQuery<PairwiseIdentifier> query = manager.createNamedQuery("PairwiseIdentifier.getBySectorIdentifier", PairwiseIdentifier.class);
query.setParameter("sub", sub);
query.setParameter("sectorIdentifier", sectorIdentifierUri);
return getSingleResult(query.getResultList());
}
/* (non-Javadoc)
* @see org.mitre.openid.connect.repository.PairwiseIdentifierRepository#getByClientId(java.lang.String, java.lang.String)
*/
@Override
public PairwiseIdentifier getByClientId(String sub, String clientId) {
TypedQuery<PairwiseIdentifier> query = manager.createNamedQuery("PairwiseIdentifier.getByClientId", PairwiseIdentifier.class);
query.setParameter("sub", sub);
query.setParameter("clientId", clientId);
return getSingleResult(query.getResultList());
}
/* (non-Javadoc)
* @see org.mitre.openid.connect.repository.PairwiseIdentifierRepository#save(org.mitre.openid.connect.model.PairwiseIdentifier)
*/
@Override
@Transactional
public void save(PairwiseIdentifier pairwise) {
saveOrUpdate(pairwise.getId(), manager, pairwise);
}
}

42
openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultUserInfoService.java
View File

@ -20,10 +20,10 @@ import org.mitre.oauth2.model.ClientDetailsEntity;
import org.mitre.oauth2.service.ClientDetailsEntityService;
import org.mitre.openid.connect.model.UserInfo;
import org.mitre.openid.connect.repository.UserInfoRepository;
import org.mitre.openid.connect.service.PairwiseIdentiferService;
import org.mitre.openid.connect.service.UserInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
/**
* Implementation of the UserInfoService
@ -40,6 +40,9 @@ public class DefaultUserInfoService implements UserInfoService {
@Autowired
private ClientDetailsEntityService clientService;
@Autowired
private PairwiseIdentiferService pairwiseIdentifierService;
@Override
public void save(UserInfo userInfo) {
userInfoRepository.save(userInfo);
@ -60,23 +63,24 @@ public class DefaultUserInfoService implements UserInfoService {
return userInfoRepository.getByUsername(username);
}
@Override
public UserInfo getByUsernameAndClientId(String username, String clientId) {
ClientDetailsEntity client = clientService.loadClientByClientId(clientId);
UserInfo userInfo = getByUsername(username);
if (client == null || userInfo == null) {
return null;
}
if (client.getSubjectType().equals(ClientDetailsEntity.SubjectType.PAIRWISE)) {
userInfo.setSub(userInfo.getSub() + "@" + clientId);
}
return userInfo;
}
@Override
public UserInfo getByUsernameAndClientId(String username, String clientId) {
ClientDetailsEntity client = clientService.loadClientByClientId(clientId);
UserInfo userInfo = getByUsername(username);
if (client == null || userInfo == null) {
return null;
}
if (client.getSubjectType().equals(ClientDetailsEntity.SubjectType.PAIRWISE)) {
String pairwiseSub = pairwiseIdentifierService.getIdentifier(userInfo, client);
userInfo.setSub(pairwiseSub);
}
return userInfo;
}
}

68
openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/UUIDPairwiseIdentiferService.java Normal file
View File

@ -0,0 +1,68 @@
/**
*
*/
package org.mitre.openid.connect.service.impl;
import java.util.UUID;
import org.mitre.oauth2.model.ClientDetailsEntity;
import org.mitre.openid.connect.model.PairwiseIdentifier;
import org.mitre.openid.connect.model.UserInfo;
import org.mitre.openid.connect.repository.PairwiseIdentifierRepository;
import org.mitre.openid.connect.service.PairwiseIdentiferService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.google.common.base.Strings;
/**
* @author jricher
*
*/
@Service("uuidPairwiseIdentiferService")
public class UUIDPairwiseIdentiferService implements PairwiseIdentiferService {
@Autowired
private PairwiseIdentifierRepository pairwiseIdentifierRepository;
@Override
public String getIdentifier(UserInfo userInfo, ClientDetailsEntity client) {
if (!Strings.isNullOrEmpty(client.getSectorIdentifierUri())) {
// if there's a sector identifier, use that for the lookup
PairwiseIdentifier pairwise = pairwiseIdentifierRepository.getBySectorIdentifier(userInfo.getSub(), client.getSectorIdentifierUri());
if (pairwise == null) {
// we don't have an identifier, need to make and save one
pairwise = new PairwiseIdentifier();
pairwise.setIdentifier(UUID.randomUUID().toString());
pairwise.setUserSub(userInfo.getSub());
pairwise.setSectorIdentifier(client.getSectorIdentifierUri());
pairwiseIdentifierRepository.save(pairwise);
}
return pairwise.getIdentifier();
} else {
// if there's no sector identifier, use the client ID
PairwiseIdentifier pairwise = pairwiseIdentifierRepository.getByClientId(userInfo.getSub(), client.getClientId());
if (pairwise == null) {
// we don't have an identifier, need to make and save one
pairwise = new PairwiseIdentifier();
pairwise.setIdentifier(UUID.randomUUID().toString());
pairwise.setUserSub(userInfo.getSub());
pairwise.setClientId(client.getClientId());
pairwiseIdentifierRepository.save(pairwise);
}
return pairwise.getIdentifier();
}
}
}

8
openid-connect-server/src/main/resources/db/tables/hsql_database_tables.sql
View File

@ -203,3 +203,11 @@ CREATE TABLE IF NOT EXISTS whitelisted_site_scope (
owner_id BIGINT,
scope VARCHAR(256)
);
CREATE TABLE IF NOT EXISTS pairwise_identifier (
id BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 1) PRIMARY KEY,
identifier VARCHAR(256),
sub VARCHAR(256),
client_id VARCHAR(256),
sector_identifier VARCHAR(2048)
);

8
openid-connect-server/src/main/resources/db/tables/mysql_database_tables.sql
View File

@ -203,3 +203,11 @@ CREATE TABLE IF NOT EXISTS whitelisted_site_scope (
owner_id BIGINT,
scope VARCHAR(256)
);
CREATE TABLE IF NOT EXISTS pairwise_identifier (
id BIGINT AUTO_INCREMENT PRIMARY KEY,
identifier VARCHAR(256),
sub VARCHAR(256),
client_id VARCHAR(256),
sector_identifier VARCHAR(2048)
);