/ - Diff - Pithos - Greek Research and Technology Network's projects

     version=1.0.0-beta
     noUsernameMessage=<B>No username found in the Shibboleth attributes!</B><P>Your Identity Provider sent the following attributes:
     fileRepositoryPath=/tmp/gss-root
     #quota in bytes(10GB)
     # Default quota in bytes (10GB)
     quota=10737418240
     #milliseconds a request's timestamp may differ from the current system time (10')
     # Coupon-awarded quota in bytes (100GB)
     couponQuota=107374182400
     # Milliseconds a request's timestamp may differ from the current system time (10')
     timeSkew=600000
     #number of days the authentication token is valid
     # Number of days the authentication token is valid
     tokenTTL=1
     solrSelectUrl=http://localhost:8983/solr/select
     solrUpdateUrl=http://localhost:8983/solr/update
     solrUpdateRichUrl=http://localhost:8983/solr/update/rich
     #must be in sync with solrconfig.xml's multipartUploadLimitInKB parameter
     # Must be in sync with solrconfig.xml's multipartUploadLimitInKB parameter
     solrDocumentUploadLimitInKB=30720
     #Tomcat apparently converts data received through the AJP connector to ISO-8859-1
     # Tomcat apparently converts data received through the AJP connector to ISO-8859-1
     requestAttributeEncoding=ISO-8859-1
     #an announcement message that will be displayed when the user logs in the system
     # An announcement message that will be displayed when the user logs in the system
     announcement=
     # The test user, for development environments only! The presence of this property
     # makes the Login servlet consider the specified user as having successfully

     /*
      * Copyright 2010 Electronic Business Systems Ltd.
+     *
      * This file is part of GSS.
+     *
      * GSS is free software: you can redistribute it and/or modify
      * it under the terms of the GNU General Public License as published by
      * the Free Software Foundation, either version 3 of the License, or
      * (at your option) any later version.
+     *
      * GSS is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with GSS.  If not, see <http://www.gnu.org/licenses/>.
      */
     package gr.ebs.gss.client.exceptions;
     import java.io.Serializable;
     import javax.ejb.ApplicationException;
     /**
      * An exception thrown when trying to reuse an already used invitation.
+     *
      * @author past
      */
     @ApplicationException(rollback=true)
     public class InvitationUsedException extends Exception implements Serializable {
     	/**
     	 * The serial version UID.
     	 */
     	private static final long serialVersionUID = 1L;
     	/**
     	 * The stored message that provides details about the problem.
     	 */
     	private String message;
     	/**
     	 * Default constructor
     	 */
     	public InvitationUsedException() {
     		super();
+    	}
     	/**
     	 * Constructor from error message.
+    	 *
     	 * @param newMessage The error message
     	 */
     	public InvitationUsedException(final String newMessage) {
     		super(newMessage);
     		message = newMessage;
+    	}
     	/**
     	 * Constructor from Throwable.
+    	 *
     	 * @param cause The throwable that caused the exception
     	 */
     	public InvitationUsedException(final Throwable cause) {
     		super(cause);
+    	}
     	/**
     	 * Constructor from error message and Throwable.
+    	 *
     	 * @param newMessage The error message
     	 * @param cause The throwable that caused the exception
     	 */
     	public InvitationUsedException(final String newMessage, final Throwable cause) {
     		super(newMessage, cause);
     		message = newMessage;
+    	}
     	@Override
     	public String getMessage() {
     		return message;
+    	}
+    }

      */
     package gr.ebs.gss.server;
     import gr.ebs.gss.client.exceptions.RpcException;
     import gr.ebs.gss.server.domain.User;
     import gr.ebs.gss.server.ejb.TransactionHelper;
     import java.io.IOException;
     import java.util.concurrent.Callable;
     import javax.servlet.http.HttpServletRequest;
     import javax.servlet.http.HttpServletResponse;
     import org.apache.commons.logging.Log;
     import org.apache.commons.logging.LogFactory;
     /**
      * The servlet that handles user registration.
+     *
-...
     	 */
     	private static final long serialVersionUID = 1L;
     	/**
     	 * The logger.
     	 */
     	private static Log logger = LogFactory.getLog(CouponVerifier.class);
     	@Override
     	public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
     		String firstname = request.getParameter(FIRSTNAME_PARAM);
     		String lastname = request.getParameter(LASTNAME_PARAM);
     		String email = request.getParameter(EMAIL_PARAM);
     		String username = request.getParameter(USERNAME_PARAM);
     		String code = request.getParameter(CODE_PARAM);
     		final String username = request.getParameter(USERNAME_PARAM);
     		final String code = request.getParameter(CODE_PARAM);
     		String verify = request.getParameter(VERIFY_PARAM);
     		response.setContentType("text/html");
-...
     			return;
+    		}
     		User user = null;
     		try {
     			user = getService().findUser(username);
     			if (user == null) {
     				handleException(response, "Your user account was not found");
     				return;
+    			}
     			// TODO: update userclass
     			/*
     			final UserDTO userDto = new TransactionHelper<UserDTO>().tryExecute(new Callable<UserDTO>() {
     				@Override
     				public UserDTO call() throws Exception {
     					return getService().createUser(username, firstname + " " + lastname, email, "", "").getDTO();
+    				}
     			});
     			new TransactionHelper<Void>().tryExecute(new Callable<Void>() {
     				@Override
     				public Void call() throws Exception {
     					getService().updateUserPolicyAcceptance(userDto.getId(), true);
     					getService().upgradeUserClass(username, code);
     					return null;
+    				}
     			});*/
     			response.sendRedirect("couponSubmitted.jsp");
     		} catch (RpcException e) {
     			logger.error(e);
     			handleException(response, "An error occurred while communicating with the service");
     			});
     			response.sendRedirect("couponSubmitted.jsp?newQuota=" + getService().getCouponUserClass().getQuotaAsString());
     		} catch (Exception e) {
     			logger.error(e);
     			handleException(response, e.getMessage());
+    		}
+    	}

     				String tokenEncoded = new String(Base64.encodeBase64(user.getAuthToken()), "US-ASCII");
     				user.setWebDAVPassword(tokenEncoded);
+    			}
     			// Set the default user class if none was set.
     			if (user.getUserClass() == null)
     				user.setUserClass(getService().getUserClasses().get(0));
     			getService().updateUser(user);
     		} catch (RpcException e) {
     			String error = "An error occurred while communicating with the service";

     import javax.persistence.Entity;
     import javax.persistence.GeneratedValue;
     import javax.persistence.Id;
     import javax.persistence.JoinColumn;
     import javax.persistence.ManyToOne;
     import javax.persistence.Version;
     import org.hibernate.annotations.Cache;
-...
     	private String email;
     	/**
     	 * The user that used this invitation.
     	 */
     	@ManyToOne
     	@JoinColumn
     	private User user;
     	/**
     	 * Retrieve the firstname.
+    	 *
     	 * @return the firstname
-...
     	 * @return the name
     	 */
     	public String getName() {
     		return name;
     		return name != null ? name : firstname + " " + lastname;
+    	}
     	/**
-...
     		return id;
+    	}
     	/**
     	 * Retrieve the user.
+    	 *
     	 * @return the user
     	 */
     	public User getUser() {
     		return user;
+    	}
     	/**
     	 * Modify the user.
+    	 *
     	 * @param aUser the user to set
     	 */
     	public void setUser(User aUser) {
     		user = aUser;
+    	}
     	@Override
     	public boolean equals(Object o) {
     		if (this == o) return true;
     		if (!(o instanceof Invitation)) return false;
     		Invitation user = (Invitation) o;
     		return user.getCode().equals(code) && user.getName().equals(name);
     		Invitation invite = (Invitation) o;
     		return invite.getCode().equals(code) && invite.getName().equals(getName());
+    	}
     	@Override
     	public int hashCode() {
     		return 37 * code.hashCode() + name.hashCode();
     		return 37 * code.hashCode() + getName().hashCode();
+    	}
+    }

     /*
      * Copyright 2007, 2008, 2009 Electronic Business Systems Ltd.
      * Copyright 2007, 2008, 2009, 2010 Electronic Business Systems Ltd.
+     *
      * This file is part of GSS.
+     *
-...
     import gr.ebs.gss.server.domain.dto.UserClassDTO;
     import java.io.Serializable;
     import java.text.DecimalFormat;
     import java.util.List;
     import javax.persistence.CascadeType;
     import javax.persistence.Embedded;
     import javax.persistence.Entity;
     import javax.persistence.GeneratedValue;
     import javax.persistence.Id;
-...
     	private int version;
     	/**
     	 * The audit information.
     	 */
     	@SuppressWarnings("unused")
     	@Embedded
     	private AuditInfo auditInfo;
     	/**
     	 * A name for this class.
     	 */
     	private String name;
-...
     	@OneToMany(cascade = CascadeType.ALL, mappedBy = "userClass")
     	private List<User> users;
     	/*
     	 * (non-Javadoc)
+    	 *
     	 * @see java.lang.Object#toString()
     	 */
     	public Long getId() {
     		return id;
+    	}
     	public String getName() {
     		return name;
+    	}
     	public void setName(String aName) {
     		name = aName;
+    	}
     	public long getQuota() {
     		return quota;
+    	}
     	public void setQuota(long aQuota) {
     		quota = aQuota;
+    	}
     	@Override
     	public String toString() {
     		return name;
-...
     	 * @return a new DTO with the same contents as this object
     	 */
     	public UserClassDTO getDTO() {
     		final UserClassDTO u = new UserClassDTO();
     		UserClassDTO u = new UserClassDTO();
     		u.setId(id);
     		u.setName(name);
     		u.setQuota(quota);
-...
     			u.getUsers().add(user.getDTO());
     		return u;
+    	}
     	/**
     	 * Return the quota size in a humanly readable form.
     	 */
     	public String getQuotaAsString() {
     		if (quota < 1024)
     			return String.valueOf(quota) + " B";
     		else if (quota < 1024*1024)
     			return getSize(quota, 1024D) + " KB";
     		else if (quota < 1024*1024*1024)
     			return getSize(quota,(1024D*1024D)) + " MB";
     		return getSize(quota , (1024D*1024D*1024D)) + " GB";
+    	}
     	private String getSize(Long size, Double divisor){
     		DecimalFormat formatter = new DecimalFormat("######");
     		return formatter.format((Double) (size.doubleValue()/divisor));
+    	}
+    }

     import gr.ebs.gss.client.exceptions.DuplicateNameException;
     import gr.ebs.gss.client.exceptions.GSSIOException;
     import gr.ebs.gss.client.exceptions.InsufficientPermissionsException;
     import gr.ebs.gss.client.exceptions.InvitationUsedException;
     import gr.ebs.gss.client.exceptions.ObjectNotFoundException;
     import gr.ebs.gss.client.exceptions.QuotaExceededException;
     import gr.ebs.gss.server.domain.FileUploadStatus;
     import gr.ebs.gss.server.domain.Invitation;
     import gr.ebs.gss.server.domain.Nonce;
     import gr.ebs.gss.server.domain.User;
     import gr.ebs.gss.server.domain.UserClass;
     import gr.ebs.gss.server.domain.dto.FileBodyDTO;
     import gr.ebs.gss.server.domain.dto.FileHeaderDTO;
     import gr.ebs.gss.server.domain.dto.FolderDTO;
-...
     	 */
     	public void createLdapUser(String username, String firstname, String lastname, String email, String password);
     	/**
     	 * Retrieves the available user classes.
     	 */
     	public List<UserClass> getUserClasses();
     	/**
     	 * Upgrades the user class to the default "coupon bearer" class and marks
     	 * the provided coupon as used.
     	 * @throws InvitationUsedException when trying to resuse an already used invitation
     	 * @throws ObjectNotFoundException if the user was not found
     	 */
     	public void upgradeUserClass(String username, String code)
     			throws ObjectNotFoundException, InvitationUsedException;
     	/**
     	 * Retrieve the user class for coupon-bearing users.
     	 */
     	public UserClass getCouponUserClass();
+    }

     import gr.ebs.gss.client.exceptions.DuplicateNameException;
     import gr.ebs.gss.client.exceptions.GSSIOException;
     import gr.ebs.gss.client.exceptions.InsufficientPermissionsException;
     import gr.ebs.gss.client.exceptions.InvitationUsedException;
     import gr.ebs.gss.client.exceptions.ObjectNotFoundException;
     import gr.ebs.gss.client.exceptions.QuotaExceededException;
     import gr.ebs.gss.server.domain.AuditInfo;
-...
     import gr.ebs.gss.server.domain.Nonce;
     import gr.ebs.gss.server.domain.Permission;
     import gr.ebs.gss.server.domain.User;
     import gr.ebs.gss.server.domain.UserClass;
     import gr.ebs.gss.server.domain.dto.FileBodyDTO;
     import gr.ebs.gss.server.domain.dto.FileHeaderDTO;
     import gr.ebs.gss.server.domain.dto.FolderDTO;
-...
+    		}
+    	}
     	/* (non-Javadoc)
     	 * @see gr.ebs.gss.server.ejb.ExternalAPI#getFile(java.lang.Long, java.lang.Long)
     	 */
     	@Override
     	public FileHeaderDTO getFile(Long userId, Long fileId) throws ObjectNotFoundException, InsufficientPermissionsException {
     		if (userId == null)
     			throw new ObjectNotFoundException("No user specified");
-...
     		user.setAuditInfo(auditInfo);
     		user.generateAuthToken();
     		user.generateWebDAVPassword();
     		// Set the default user class to the one with the lowest quota.
     		user.setUserClass(getUserClasses().get(0));
     		dao.create(user);
     		// Make sure we get an ID in the user object.
     		dao.flush();
-...
+    	}
     	@Override
     	public List<UserClass> getUserClasses() {
     		List<UserClass> classes = dao.getUserClasses();
     		// Create a default user class for first-time use. Afterwards, the
     		// admin should modify or add to the userclass table.
     		if (classes.size() == 0) {
     			UserClass defaultClass = new UserClass();
     			defaultClass.setName("default");
     			Long defaultQuota = getConfiguration().getLong("quota", new Long(52428800L));
     			defaultClass.setQuota(defaultQuota);
     			dao.create(defaultClass);
     			classes.add(defaultClass);
+    		}
     		return classes;
+    	}
     	@Override
     	public User findUserByEmail(String email) {
     		return dao.findUserByEmail(email);
+    	}
-...
+    	}
     	/**
     	 * Gets the quota left for specified userId
     	 * @param userId
     	 * @return
     	 * Gets the quota left for specified user ID.
     	 */
     	private Long getQuotaLeft(Long userId){
     	private Long getQuotaLeft(Long userId) throws ObjectNotFoundException{
     		Long fileSize = dao.getFileSize(userId);
     		Long quota = getQuota(userId);
     		return quota - fileSize;
+    	}
     	/**
     	 * Gets the quota for specified userId
     	 * @param userId
     	 * @return
     	 * Gets the quota for specified user ID.
     	 */
     	private Long getQuota(@SuppressWarnings("unused") Long userId){
     		Long quota = getConfiguration().getLong("quota", new Long(52428800L));
     		return quota;
     	private Long getQuota(Long userId) throws ObjectNotFoundException{
     		return getUser(userId).getUserClass().getQuota();
+    	}
     	public void rebuildSolrIndex() {
-...
     	 * @param owner the owner of the file
     	 * @throws FileNotFoundException
     	 * @throws QuotaExceededException
     	 * @throws ObjectNotFoundException if the owner was not found
     	 */
     	private void createFileBody(String name, String mimeType, long fileSize, String filePath,
     				FileHeader header, AuditInfo auditInfo)
     			throws FileNotFoundException, QuotaExceededException {
     			throws FileNotFoundException, QuotaExceededException, ObjectNotFoundException {
     		long currentTotalSize = 0;
     		if (!header.isVersioned() && header.getCurrentBody() != null && header.getBodies() != null)
-...
+    	}
     	@Override
     	public void upgradeUserClass(String username, String code) throws ObjectNotFoundException, InvitationUsedException {
     		User user = findUser(username);
     		if (user == null)
     			throw new ObjectNotFoundException("The user was not found");
     		Invitation invite = findInvite(code);
     		if (invite.getUser() != null)
     			throw new InvitationUsedException("This code has already been used");
     		invite.setUser(user);
     		user.setUserClass(getCouponUserClass());
+    	}
     	@Override
     	public UserClass getCouponUserClass() {
     		return dao.findCouponUserClass();
+    	}
+    }

     import gr.ebs.gss.server.domain.Invitation;
     import gr.ebs.gss.server.domain.Nonce;
     import gr.ebs.gss.server.domain.User;
     import gr.ebs.gss.server.domain.UserClass;
     import java.util.Date;
     import java.util.List;
-...
     	 * @return the Invitation or null if not found
     	 */
     	public Invitation findInvite(String code);
     	/**
     	 * Retrieves available user classes.
+    	 *
     	 */
     	public List<UserClass> getUserClasses();
     	/**
     	 * Retrieve the user class for coupon-bearing users.
     	 */
     	public UserClass findCouponUserClass();
+    }

      */
     package gr.ebs.gss.server.ejb;
     import static gr.ebs.gss.server.configuration.GSSConfigurationFactory.getConfiguration;
     import gr.ebs.gss.client.exceptions.ObjectNotFoundException;
     import gr.ebs.gss.server.domain.AccountingInfo;
     import gr.ebs.gss.server.domain.FileBody;
-...
     import gr.ebs.gss.server.domain.Invitation;
     import gr.ebs.gss.server.domain.Nonce;
     import gr.ebs.gss.server.domain.User;
     import gr.ebs.gss.server.domain.UserClass;
     import java.util.ArrayList;
     import java.util.Calendar;
-...
     		return results.get(0);
+    	}
     	@Override
     	public List<UserClass> getUserClasses() {
     		// Ordering by quota is important here.
     		List<UserClass> ids = manager.createQuery("select uc from UserClass uc order by uc.quota").getResultList();
     		return ids;
+    	}
     	@Override
     	public UserClass findCouponUserClass() {
     		List<UserClass> results = manager.createQuery("select uc from UserClass uc where uc.name=:name").
     				setParameter("name", getConfiguration().getString("couponQuota")).getResultList();
     		if (results.isEmpty()) {
     			// Create the coupon user class on first use.
     			UserClass couponClass = new UserClass();
     			couponClass.setName("coupon");
     			Long couponQuota = getConfiguration().getLong("couponQuota", new Long(52428800L));
     			couponClass.setQuota(couponQuota);
     			create(couponClass);
     			flush();
     			results.add(couponClass);
+    		}
     		return results.get(0);
+    	}
+    }

     <div class="page_main">
     <center>
     <p>
     Your account quota was successfully upgraded. You may now
     Your account quota was successfully upgraded. You now have <%= request.getParameter("newQuota") %> of storage. You may now
     <a href="<%= request.getContextPath()+ "/login?next=" + GSSConfigurationFactory.getConfiguration().getString("serviceURL") %>">
     login</a> to <%= GSSConfigurationFactory.getConfiguration().getString("serviceName") %>
     </center>

Synnefo » Pithos

Revision 01a30cd0