hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-15 22:13:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DS-707] Malicious code fixes

Browse Source 
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@5562 9c30dcfa-912a-0410-8fc2-9e0234be79fd
This commit is contained in:
Graham Triggs
2010-10-22 22:26:22 +00:00
parent d8223310eb
commit 29ae4c27d8
22 changed files with 94 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dspace-api/src/main/java/org/dspace/app/itemupdate/ItemUpdate.java
View File

@@ -94,13 +94,13 @@ import org.dspace.eperson.EPerson;
*/
public class ItemUpdate {
static public String SUPPRESS_UNDO_FILENAME = "suppress_undo";
static public final String SUPPRESS_UNDO_FILENAME = "suppress_undo";
static public final String CONTENTS_FILE = "contents";
static public final String DELETE_CONTENTS_FILE = "delete_contents";
static public String HANDLE_PREFIX = null;
static public Map<String, String> filterAliases = new HashMap<String, String>();
static public final Map<String, String> filterAliases = new HashMap<String, String>();
static public boolean verbose = false;

8
dspace-api/src/main/java/org/dspace/app/mediafilter/MediaFilterManager.java
View File

@@ -85,13 +85,13 @@ import org.dspace.search.DSIndexer;
public class MediaFilterManager
{
//key (in dspace.cfg) which lists all enabled filters by name
public static String MEDIA_FILTER_PLUGINS_KEY = "filter.plugins";
public static final String MEDIA_FILTER_PLUGINS_KEY = "filter.plugins";
//prefix (in dspace.cfg) for all filter properties
public static String FILTER_PREFIX = "filter";
public static final String FILTER_PREFIX = "filter";
//suffix (in dspace.cfg) for input formats supported by each filter
public static String INPUT_FORMATS_SUFFIX = "inputFormats";
public static final String INPUT_FORMATS_SUFFIX = "inputFormats";
public static boolean updateIndex = true; // default to updating index
@@ -117,7 +117,7 @@ public class MediaFilterManager
//separator in filterFormats Map between a filter class name and a plugin name,
//for MediaFilters which extend SelfNamedPlugin (\034 is "file separator" char)
public static String FILTER_PLUGIN_SEPARATOR = "\034";
public static final String FILTER_PLUGIN_SEPARATOR = "\034";
public static void main(String[] argv) throws Exception
{

4
dspace-api/src/main/java/org/dspace/app/util/DCInput.java
View File

@@ -100,13 +100,13 @@ public class DCInput
* The scope of the input sets, this restricts hidden metadata fields from
* view during workflow processing.
*/
public static String WORKFLOW_SCOPE = "workflow";
public static final String WORKFLOW_SCOPE = "workflow";
/**
* The scope of the input sets, this restricts hidden metadata fields from
* view by the end user during submission.
*/
public static String SUBMISSION_SCOPE = "submit";
public static final String SUBMISSION_SCOPE = "submit";
/**
* Class constructor for creating a DCInput object based on the contents of

2
dspace-api/src/main/java/org/dspace/checker/BitstreamInfoDAO.java
View File

@@ -62,7 +62,7 @@ public final class BitstreamInfoDAO extends DAOSupport
* This value should be returned by <code>next()</code> to indicate that
* there are no more values.
*/
public static int SENTINEL = -1;
public static final int SENTINEL = -1;
/** Query that gets bitstream information for a specified ID. */
private static final String FIND_BY_BITSTREAM_ID = "select bitstream.deleted, bitstream.store_number, bitstream.size_bytes, "

6
dspace-api/src/main/java/org/dspace/eperson/Supervisor.java
View File

@@ -66,13 +66,13 @@ public class Supervisor {
private static Logger log = Logger.getLogger(Supervisor.class);
/** value to use for no policy set */
public static int POLICY_NONE = 0;
public static final int POLICY_NONE = 0;
/** value to use for editor policies */
public static int POLICY_EDITOR = 1;
public static final int POLICY_EDITOR = 1;
/** value to use for observer policies */
public static int POLICY_OBSERVER = 2;
public static final int POLICY_OBSERVER = 2;
/** Creates a new instance of Supervisor */
private Supervisor()

2
dspace-api/src/main/java/org/dspace/harvest/OAIHarvester.java
View File

@@ -1054,7 +1054,7 @@ public class OAIHarvester {
static EPerson harvestAdmin;
static Context mainContext;
public static Object lock = new Object();
public static final Object lock = new Object();
private static Stack<HarvestThread> harvestThreads;
private static Integer maxActiveThreads;

2
dspace-api/src/main/java/org/dspace/license/CreativeCommons.java
View File

@@ -80,7 +80,7 @@ public class CreativeCommons
private static final String BSN_LICENSE_RDF = "license_rdf";
protected static Templates templates = null;
protected static final Templates templates;
private static boolean enabled_p;

4
dspace-api/src/main/java/org/dspace/license/LicenseCleanup.java
View File

@@ -71,9 +71,9 @@ import org.dspace.core.Context;
public class LicenseCleanup
{
private static Logger log = Logger.getLogger(LicenseCleanup.class);
private static final Logger log = Logger.getLogger(LicenseCleanup.class);
protected static Templates templates = null;
protected static final Templates templates;
static
{

12
dspace-api/src/main/java/org/dspace/submit/AbstractProcessingStep.java
View File

@@ -87,22 +87,22 @@ public abstract class AbstractProcessingStep
/***************************************************************************
* Constant - Name of the "<-Previous" button
**************************************************************************/
public static String PREVIOUS_BUTTON = "submit_prev";
public static final String PREVIOUS_BUTTON = "submit_prev";
/***************************************************************************
* Constant - Name of the "Next->" button
**************************************************************************/
public static String NEXT_BUTTON = "submit_next";
public static final String NEXT_BUTTON = "submit_next";
/***************************************************************************
* Constant - Name of the "Cancel/Save" button
**************************************************************************/
public static String CANCEL_BUTTON = "submit_cancel";
public static final String CANCEL_BUTTON = "submit_cancel";
/***************************************************************************
* Constant - Prefix of all buttons in the Progress Bar
**************************************************************************/
public static String PROGRESS_BAR_PREFIX = "submit_jump_";
public static final String PROGRESS_BAR_PREFIX = "submit_jump_";
/***************************************************************************
* Flag which specifies that the LAST PAGE of a step has been reached. This
@@ -110,13 +110,13 @@ public abstract class AbstractProcessingStep
* workspace) to specify that the LAST PAGE of the LAST STEP has already
* been reached
**************************************************************************/
public static int LAST_PAGE_REACHED = Integer.MAX_VALUE;
public static final int LAST_PAGE_REACHED = Integer.MAX_VALUE;
/***************************************************************************
* STATUS / ERROR FLAGS (returned by doProcessing() if an error occurs or
* additional user interaction may be required)
**************************************************************************/
public static int STATUS_COMPLETE = 0;
public static final int STATUS_COMPLETE = 0;
/** Maps each status/error flag to a textual, human understandable message * */
private Map errorMessages = null;

88
dspace-api/src/main/java/org/dspace/text/filter/Language.java
View File

@@ -52,50 +52,50 @@ public class Language
public final String ISO639_1;
public final String ISO639_2;
public static Language AFRIKAANS = Language.create("af", "af", "afr");
public static Language ALBANIAN = Language.create("sq", "sq", "alb");
public static Language ARABIC = Language.create("ar", "ar", "ara");
public static Language BALUCHI = Language.create("bal", "", "bal");
public static Language BASQUE = Language.create("eu", "", "baq");
public static Language BRAHUI = Language.create("", "", "");
public static Language CATALAN = Language.create("ca", "ca", "cat");
public static Language CLASSICAL_GREEK = Language.create("grc", "", "grc");
public static Language DANISH = Language.create("da", "da", "dan");
public static Language DUTCH = Language.create("nl", "ni", "dut");
public static Language ENGLISH = Language.create("en", "en", "eng");
public static Language ESPERANTO = Language.create("eo", "eo", "epo");
public static Language FRENCH = Language.create("fr", "fr", "fre");
public static Language FRISIAN = Language.create("fy", "fy", "fri");
public static Language GALICIAN = Language.create("gl", "gl", "glg");
public static Language GERMAN = Language.create("de", "de", "ger");
public static Language GREEK = Language.create("el", "el", "gre");
public static Language HAWAIIAN = Language.create("haw", "", "haw");
public static Language HEBREW = Language.create("he", "he", "heb");
public static Language HUNGARIAN = Language.create("hu", "hu", "hun");
public static Language ICELANDIC = Language.create("is", "is", "ice");
public static Language IRISH = Language.create("ga", "ga", "gle");
public static Language ITALIAN = Language.create("it", "it", "ita");
public static Language MALAGASY = Language.create("mg", "mg", "mlg");
public static Language MALTESE = Language.create("mt", "mt", "mlt");
public static Language NEAPOLITAN_ITALIAN = Language.create("nap", "", "nap");
public static Language NORWEGIAN = Language.create("no", "no", "nor");
public static Language PORTUGUESE = Language.create("pt", "pt", "por");
public static Language PANJABI = Language.create("pa", "pa", "pan");
public static Language PERSIAN = Language.create("fa", "fa", "per");
public static Language PROVENCAL = Language.create("pro", "", "pro");
public static Language PROVENCAL_OCCITAN = Language.create("oc", "oc", "oci");
public static Language ROMANIAN = Language.create("ro", "ro", "rum");
public static Language SCOTS = Language.create("sco", "", "sco");
public static Language SCOTTISH_GAELIC = Language.create("gd", "gd", "gae");
public static Language SHETLAND_ENGLISH = Language.create("", "", "");
public static Language SPANISH = Language.create("es", "es", "spa");
public static Language SWEDISH = Language.create("sv", "sv", "swe");
public static Language TAGALOG = Language.create("tl", "tl", "tgl");
public static Language TURKISH = Language.create("tr", "tr", "tur");
public static Language URDU = Language.create("ur", "ur", "urd");
public static Language WALLOON = Language.create("wa", "wa", "wln");
public static Language WELSH = Language.create("cy", "cy", "wel");
public static Language YIDDISH = Language.create("yi", "yi", "yid");
public static final Language AFRIKAANS = Language.create("af", "af", "afr");
public static final Language ALBANIAN = Language.create("sq", "sq", "alb");
public static final Language ARABIC = Language.create("ar", "ar", "ara");
public static final Language BALUCHI = Language.create("bal", "", "bal");
public static final Language BASQUE = Language.create("eu", "", "baq");
public static final Language BRAHUI = Language.create("", "", "");
public static final Language CATALAN = Language.create("ca", "ca", "cat");
public static final Language CLASSICAL_GREEK = Language.create("grc", "", "grc");
public static final Language DANISH = Language.create("da", "da", "dan");
public static final Language DUTCH = Language.create("nl", "ni", "dut");
public static final Language ENGLISH = Language.create("en", "en", "eng");
public static final Language ESPERANTO = Language.create("eo", "eo", "epo");
public static final Language FRENCH = Language.create("fr", "fr", "fre");
public static final Language FRISIAN = Language.create("fy", "fy", "fri");
public static final Language GALICIAN = Language.create("gl", "gl", "glg");
public static final Language GERMAN = Language.create("de", "de", "ger");
public static final Language GREEK = Language.create("el", "el", "gre");
public static final Language HAWAIIAN = Language.create("haw", "", "haw");
public static final Language HEBREW = Language.create("he", "he", "heb");
public static final Language HUNGARIAN = Language.create("hu", "hu", "hun");
public static final Language ICELANDIC = Language.create("is", "is", "ice");
public static final Language IRISH = Language.create("ga", "ga", "gle");
public static final Language ITALIAN = Language.create("it", "it", "ita");
public static final Language MALAGASY = Language.create("mg", "mg", "mlg");
public static final Language MALTESE = Language.create("mt", "mt", "mlt");
public static final Language NEAPOLITAN_ITALIAN = Language.create("nap", "", "nap");
public static final Language NORWEGIAN = Language.create("no", "no", "nor");
public static final Language PORTUGUESE = Language.create("pt", "pt", "por");
public static final Language PANJABI = Language.create("pa", "pa", "pan");
public static final Language PERSIAN = Language.create("fa", "fa", "per");
public static final Language PROVENCAL = Language.create("pro", "", "pro");
public static final Language PROVENCAL_OCCITAN = Language.create("oc", "oc", "oci");
public static final Language ROMANIAN = Language.create("ro", "ro", "rum");
public static final Language SCOTS = Language.create("sco", "", "sco");
public static final Language SCOTTISH_GAELIC = Language.create("gd", "gd", "gae");
public static final Language SHETLAND_ENGLISH = Language.create("", "", "");
public static final Language SPANISH = Language.create("es", "es", "spa");
public static final Language SWEDISH = Language.create("sv", "sv", "swe");
public static final Language TAGALOG = Language.create("tl", "tl", "tgl");
public static final Language TURKISH = Language.create("tr", "tr", "tur");
public static final Language URDU = Language.create("ur", "ur", "urd");
public static final Language WALLOON = Language.create("wa", "wa", "wln");
public static final Language WELSH = Language.create("cy", "cy", "wel");
public static final Language YIDDISH = Language.create("yi", "yi", "yid");
public static Language getLanguage(String lang)
{

2
dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/submit/JSPStep.java
View File

@@ -93,7 +93,7 @@ public abstract class JSPStep
* Value to return from doPreProcessing to specify not to load any JSP Page
* (equal to "") *
*/
public static String NO_JSP = "";
public static final String NO_JSP = "";
/**
* Do any pre-processing to determine which JSP (if any) is used to generate

2
dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/util/UIUtil.java
View File

@@ -81,7 +81,7 @@ public class UIUtil extends Util
private static Boolean useProxies;
/** log4j category */
public static Logger log = Logger.getLogger(UIUtil.class);
public static final Logger log = Logger.getLogger(UIUtil.class);
/**
* Pattern used to get file.ext from filename (which can be a path)

2
dspace-oai/dspace-oai-api/src/main/java/org/dspace/app/oai/DIDLCrosswalk.java
View File

@@ -68,7 +68,7 @@ import ORG.oclc.oai.server.verb.ServerVerb;
public class DIDLCrosswalk extends Crosswalk
{
/** default value if no oai.didl.maxresponse property is defined */
public static int MAXRESPONSE_INLINE_BITSTREAM = 0;
public static final int MAXRESPONSE_INLINE_BITSTREAM = 0;
/** another crosswalk that will be used to generate the metadata section */
private Crosswalk metadataCrosswalk;

2
dspace-sword/dspace-sword-api/src/main/java/org/dspace/sword/CollectionLocation.java
View File

@@ -61,7 +61,7 @@ import org.dspace.handle.HandleManager;
public class CollectionLocation
{
/** Log4j logger */
public static Logger log = Logger.getLogger(CollectionLocation.class);
public static final Logger log = Logger.getLogger(CollectionLocation.class);
/**
* Obtain the deposit URL for the given collection. These URLs

2
dspace-sword/dspace-sword-api/src/main/java/org/dspace/sword/DSpaceSWORDServer.java
View File

@@ -65,7 +65,7 @@ import org.purl.sword.base.ServiceDocumentRequest;
public class DSpaceSWORDServer implements SWORDServer
{
/** Log4j logger */
public static Logger log = Logger.getLogger(DSpaceSWORDServer.class);
public static final Logger log = Logger.getLogger(DSpaceSWORDServer.class);
// methods required by SWORDServer interface
////////////////////////////////////////////

2
dspace-sword/dspace-sword-api/src/main/java/org/dspace/sword/DepositManager.java
View File

@@ -64,7 +64,7 @@ import org.purl.sword.base.SWORDErrorException;
public class DepositManager
{
/** Log4j logger */
public static Logger log = Logger.getLogger(DepositManager.class);
public static final Logger log = Logger.getLogger(DepositManager.class);
/** The SWORD service implementation */
private SWORDService swordService;

2
dspace-sword/dspace-sword-api/src/main/java/org/dspace/sword/SWORDMETSIngester.java
View File

@@ -64,7 +64,7 @@ public class SWORDMETSIngester implements SWORDIngester
private SWORDService swordService;
/** Log4j logger */
public static Logger log = Logger.getLogger(SWORDMETSIngester.class);
public static final Logger log = Logger.getLogger(SWORDMETSIngester.class);
/* (non-Javadoc)
* @see org.dspace.sword.SWORDIngester#ingest(org.dspace.core.Context, org.purl.sword.base.Deposit)

2
dspace-sword/dspace-sword-api/src/main/java/org/dspace/sword/SWORDService.java
View File

@@ -63,7 +63,7 @@ import org.purl.sword.base.Deposit;
public class SWORDService
{
/** Log4j logging instance */
public static Logger log = Logger.getLogger(SWORDService.class);
public static final Logger log = Logger.getLogger(SWORDService.class);
/** The SWORD context of the request */
private SWORDContext swordContext;

16
dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/CurrentActivityAction.java
View File

@@ -71,10 +71,10 @@ public class CurrentActivityAction extends AbstractAction
{
/** The maximum number of events that are recorded */
public static int MAX_EVENTS = 250;
public static final int MAX_EVENTS;
/** The HTTP header that contains the real IP for this request, this is used when DSpace is placed behind a load balancer */
public static String IP_HEADER = "X-Forwarded-For";
public static final String IP_HEADER;
/** The ordered list of events, by access time */
private static Queue<Event> events = new LinkedList<Event>();
@@ -91,11 +91,23 @@ public class CurrentActivityAction extends AbstractAction
static {
// If the dspace.cfg has a max event count then use it.
if (ConfigurationManager.getProperty("xmlui.controlpanel.activity.max") != null)
{
MAX_EVENTS = ConfigurationManager.getIntProperty("xmlui.controlpanel.activity.max");
}
else
{
MAX_EVENTS = 250;
}
if (ConfigurationManager.getProperty("xmlui.controlpanel.activity.ipheader") != null)
{
IP_HEADER = ConfigurationManager.getProperty("xmlui.controlpanel.activity.ipheader");
}
else
{
IP_HEADER = "X-Forwarded-For";
}
}
/**

6
dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/SystemwideAlerts.java
View File

@@ -64,9 +64,9 @@ public class SystemwideAlerts extends AbstractDSpaceTransformer implements Cache
private static final Message T_COUNTDOWN = message("xmlui.administrative.SystemwideAlerts.countdown");
/** Possible user restricted states */
public static int STATE_ALL_SESSIONS = 1;
public static int STATE_CURRENT_SESSIONS = 2;
public static int STATE_ONLY_ADMINISTRATIVE_SESSIONS = 3;
public static final int STATE_ALL_SESSIONS = 1;
public static final int STATE_CURRENT_SESSIONS = 2;
public static final int STATE_ONLY_ADMINISTRATIVE_SESSIONS = 3;
// Is an alert activated?

2
dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/objectmanager/AbstractAdapter.java
View File

@@ -567,7 +567,7 @@ public abstract class AbstractAdapter
* then it should use the string "OTHER" and provide additional
* attributes describing the metadata type
*/
public static String[] METS_DEFINED_TYPES =
public static final String[] METS_DEFINED_TYPES =
{"MARC","MODS","EAD","DC","NISOIMG","LC-AV","VRA","TEIHDR","DDI","FGDC","PREMIS"/*,"OTHER"*/};
/**

4
dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/objectmanager/RepositoryAdapter.java
View File

@@ -69,8 +69,8 @@ public class RepositoryAdapter extends AbstractAdapter
{
/** MODS namespace */
public static String MODS_URI = "http://www.loc.gov/mods/v3";
public static Namespace MODS = new Namespace(MODS_URI);
public static final String MODS_URI = "http://www.loc.gov/mods/v3";
public static final Namespace MODS = new Namespace(MODS_URI);
/** A space separated list of descriptive metadata sections */