- * A {@link Filter} that enable client-side cross-origin requests by - * implementing W3C's CORS (Cross-Origin Resource - * Sharing) specification for resources. Each {@link HttpServletRequest} - * request is inspected as per specification, and appropriate response headers - * are added to {@link HttpServletResponse}. - *
- * - *- * By default, it also sets following request attributes, that helps to - * determine nature of request downstream. - *
- *-
- *
- cors.isCorsRequest: Flag to determine if request is a CORS
- * request. Set to
trueif CORS request;false- * otherwise.
- * - cors.request.origin: The Origin URL. - *
- cors.request.type: Type of request. Values:
simpleor - *preflightornot_corsorinvalid_cors
- * - cors.request.headers: Request headers sent as - * 'Access-Control-Request-Headers' header, for pre-flight request. - *
-
- *
- cors.isCorsRequest: Flag to determine if request is a CORS
- * request. Set to
trueif CORS request;false- * otherwise.
- * - cors.request.origin: The Origin URL. - *
- cors.request.type: Type of request. Values:
- *
simpleorpreflightornot_corsor - *invalid_cors
- * - cors.request.headers: Request headers sent as - * 'Access-Control-Request-Headers' header, for pre-flight request. - *
null if elements
- * {@link Set} is null.
- */
- public static String join(final Collectiontrue if origin is allowed; false
- * otherwise.
- */
- private boolean isOriginAllowed(final String origin) {
- if (anyOriginAllowed) {
- return true;
- }
-
- // If 'Origin' header is a case-sensitive match of any of allowed
- // origins, then return true, else return false.
- return allowedOrigins.contains(origin);
- }
-
- private void log(String message) {
- if (loggingEnabled) {
- filterConfig.getServletContext().log(message);
- }
- }
-
- /**
- * Parses each param-value and populates configuration variables. If a param
- * is provided, it overrides the default.
- *
- * @param allowedOrigins
- * A {@link String} of comma separated origins.
- * @param allowedHttpMethods
- * A {@link String} of comma separated HTTP methods.
- * @param allowedHttpHeaders
- * A {@link String} of comma separated HTTP headers.
- * @param exposedHeaders
- * A {@link String} of comma separated headers that needs to be
- * exposed.
- * @param supportsCredentials
- * "true" if support credentials needs to be enabled.
- * @param preflightMaxAge
- * The amount of seconds the user agent is allowed to cache the
- * result of the pre-flight request.
- * @param loggingEnabled
- * Flag to control logging to access log.
- * @throws ServletException
- */
- private void parseAndStore(final String allowedOrigins,
- final String allowedHttpMethods, final String allowedHttpHeaders,
- final String exposedHeaders, final String supportsCredentials,
- final String preflightMaxAge, final String loggingEnabled,
- final String decorateRequest)
- throws ServletException {
- if (allowedOrigins != null) {
- if (allowedOrigins.trim().equals("*")) {
- this.anyOriginAllowed = true;
- } else {
- this.anyOriginAllowed = false;
- Set-
- *
- If an encoded character is present in origin, it's not valid. - *
- Origin should be a valid {@link URI} - *
true if it's enabled; false otherwise.
- */
- public boolean isLoggingEnabled() {
- return loggingEnabled;
- }
-
- /**
- * Determines if any origin is allowed to make CORS request.
- *
- * @return true if it's enabled; false otherwise.
- */
- public boolean isAnyOriginAllowed() {
- return anyOriginAllowed;
- }
-
- /**
- * Returns a {@link Set} of headers that should be exposed by browser.
- *
- * @return
- */
- public Collection
-
-
-
diff --git a/src/edu/stanford/nlp/naturalli/demo/naturalli.css b/src/edu/stanford/nlp/naturalli/demo/naturalli.css
deleted file mode 100644
index 10656a7c12..0000000000
--- a/src/edu/stanford/nlp/naturalli/demo/naturalli.css
+++ /dev/null
@@ -1,119 +0,0 @@
-body {
- padding-top: 40px;
- padding-bottom: 40px;
- background-color: #eee;
-}
-
-.form-query .form-control {
- position: relative;
- height: auto;
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- box-sizing: border-box;
- padding: 10px;
- font-size: 12px;
-}
-.form-query .form-control:focus {
- z-index: 2;
-}
-
-#truth-value {
- font-weight: bold;
- font-size: xx-large;
-}
-.truth-value-true {
- color: green;
-}
-.truth-value-false {
- color: red;
-}
-.truth-value-unknown {
- color: red;
-}
-.truth-value-error {
- color: red;
-}
-.truth-gloss {
- font-size: xx-large;
-}
-
-.justification-entry {
- font-size: large;
-}
-
-
-.justification-table {
- font-size: 12px;
- border-collapse: collapse;
- width: 100%;
-}
-.justification-table th {
- font-size: 14px;
- font-weight: normal;
- color: #039;
- padding: 10px 8px;
- border-bottom: 2px solid #6678b1;
- text-align:center;
-}
-.justification-table td {
- color: #669;
- padding: 9px 8px 0px 8px;
- text-align:center;
-}
-.justification-table th td {
- padding-left: 50px;
- padding-right: 50px;
-}
-.justification-table tbody tr:hover td {
- color: #009;
-}
-
-.justification-singleline {
- text-align: center;
- color: #039;
- font-size: 14pt;
- margin-top: 10px;
- margin-bottom: 25px;
-}
-.justification-singleline-input {
- font-weight: bold;
-}
-.justification-singleline-fact {
- color: #333;
- font-weight: bold;
-}
-
-.not-selectable {
- -webkit-touch-callout: none;
- -webkit-user-select: none;
- -khtml-user-select: none;
- -moz-user-select: none;
- -ms-user-select: none;
- user-select: none;
-}
-
-.centered {
- margin: 0 auto;
- text-align: center;
-}
-
-h2 {
- color: #000080;
- padding-bottom: 1ex;
-}
-
-.triples {
- font-size: large;
- text-align: center;
-}
-
-.triple-table {
- margin: 0 auto !important;
- float: none !important;
-}
-
-td {
- text-align: left;
- padding-right: 2ex;
- padding-bottom: 1ex;
-}
diff --git a/src/edu/stanford/nlp/naturalli/demo/naturalli.js b/src/edu/stanford/nlp/naturalli/demo/naturalli.js
deleted file mode 100644
index 1671ac610c..0000000000
--- a/src/edu/stanford/nlp/naturalli/demo/naturalli.js
+++ /dev/null
@@ -1,83 +0,0 @@
-
-function handleError(message) {
- $( "#q" ).prop('disabled', false);
- $( "#query-button").unbind( "click" );
- $( "#query-button" ).click(function(event) { $( "#form-query" ).submit(); });
- $( "#triples-container").html('
-
-
-
-
-
- Open IE ACL Demo
-
-
-
-
-
-
-
-
-
-
- Our System
- -
-
- Ollie
- -ERROR
(' + message + ')
');
-}
-
-function querySuccess(elem) {
- return function(response) {
- $( "#q" ).prop('disabled', false);
- $( "#query-button").unbind( "click" );
- $( "#query-button" ).click(function(event) { $( "#form-query" ).submit(); });
- if (response.triples.length > 0) {
- var gloss = '';
- for (i = 0; i < response.triples.length; ++i) {
- gloss += '
';
- $(elem).html(gloss);
- } else {
- $(elem).html('(no responses)');
- }
- }
-}
-
-
-$(document).ready(function(){
- jQuery.support.cors = true;
-
- if ($(window).width() < 650) {
- $( '#fork' ).hide();
- }
-
- // Justification
- $("#justification-toggle-row").hide();
-
- // Query submit
- $( "#form-query" ).submit(function( event ) {
- // (don't actually submit anything)
- event.preventDefault();
- // (set the headers)
- $( "#system-header" ).css("visibility", "visible");
- $( "#ollie-header" ).css("visibility", "visible");
- // (create a default if not input was given)
- if ( $( '#q' ).val().trim() == '') { $( '#q' ).val('This is a demo for an ACL paper submission which is under review.'); }
- // (start loading icon)
- $( '#triples-container' ).html('loading...');
- $( '#ollie-container' ).html('loading...');
- // (submission data)
- target = $(this).attr('action');
- getData = $(this).serialize();
- value = $( "#q" ).val();
- // (disable query button
- $( "#q" ).prop('disabled', true);
- $( "#query-button").unbind( "click" );
- // (ajax request)
- $.ajax({
- url: 'http://plato42.stanford.edu:8080/openie/',
- data: getData,
- dataType: 'json',
- success: querySuccess("#triples-container")
- });
- $.ajax({
- url: 'http://plato42.stanford.edu:8080/ollie/',
- data: getData,
- dataType: 'json',
- success: querySuccess("#ollie-container")
- });
- });
-
-
- // Query button
- $( "#query-button" ).mousedown(function(event) {
- $( '#query-button' ).css('background', 'darkgray');
- });
- $( document ).mouseup(function(event) {
- $( '#query-button' ).css('background', '');
- });
- $( "#query-button" ).click(function(event) { $( "#form-query" ).submit(); });
-});
diff --git a/src/edu/stanford/nlp/naturalli/demo/rightarrow.png b/src/edu/stanford/nlp/naturalli/demo/rightarrow.png
deleted file mode 100644
index 2478f624ee..0000000000
Binary files a/src/edu/stanford/nlp/naturalli/demo/rightarrow.png and /dev/null differ
diff --git a/src/edu/stanford/nlp/naturalli/demo/web.xml b/src/edu/stanford/nlp/naturalli/demo/web.xml
deleted file mode 100644
index d071e93039..0000000000
--- a/src/edu/stanford/nlp/naturalli/demo/web.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
-
- NaturalLI OpenIE Server
-
- The backend servlet for the NaturalLI OpenIE demo.
-
-
-
- openie
- edu.stanford.nlp.naturalli.demo.OpenIEServlet
-
- 5
-
-
-
-
- openie
- /
-
-
-
- 30
-
-
-
-
- cors-ebay
- edu.stanford.nlp.naturalli.demo.CORSFilter
-
- cors.allowed.origins
-
- *
-
-
- cors.allowed.methods
- GET,POST,HEAD,OPTIONS,PUT
-
-
- cors.logging.enabled
- true
-
-
-
-
- cors-ebay
- *
-
-
\ No newline at end of file
diff --git a/src/edu/stanford/nlp/parser/nndep/CoNLLUTagUpdater.java b/src/edu/stanford/nlp/parser/nndep/CoNLLUTagUpdater.java
deleted file mode 100644
index 10ebb8a952..0000000000
--- a/src/edu/stanford/nlp/parser/nndep/CoNLLUTagUpdater.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package edu.stanford.nlp.parser.nndep;
-
-import edu.stanford.nlp.ling.*;
-import edu.stanford.nlp.pipeline.*;
-import edu.stanford.nlp.tagger.maxent.MaxentTagger;
-import edu.stanford.nlp.util.*;
-
-import java.io.*;
-import java.util.*;
-
-public class CoNLLUTagUpdater {
-
- public static MaxentTagger maxentTagger;
-
- public static void main(String[] args) throws ClassNotFoundException, IOException {
- // load properties
- Properties props = StringUtils.argsToProperties(args);
- String taggerPath = props.getProperty("tagger");
- String inputPath = props.getProperty("inputFile");
- String outputPath = props.getProperty("outputFile");
- // set up tagger
- maxentTagger = new MaxentTagger(taggerPath);
- // make CoNLLUReader and read in file
- CoNLLUReader reader = new CoNLLUReader();
- List annotations = reader.readCoNLLUFile(inputPath);
- // update tags
- for (Annotation ann : annotations) {
- for (CoreMap sentence : ann.get(CoreAnnotations.SentencesAnnotation.class)) {
- maxentTagger.tagCoreLabels(sentence.get(CoreAnnotations.TokensAnnotation.class));
- }
- }
- // output updated file
- Properties outputProps = new Properties();
- outputProps.setProperty("output.dependenciesType", "ENHANCEDPLUSPLUS");
- CoNLLUOutputter conLLUOutputter = new CoNLLUOutputter(outputProps);
- for (Annotation ann : annotations) {
- conLLUOutputter.print(ann, new BufferedOutputStream(new FileOutputStream(outputPath)));
- }
- }
-}
diff --git a/src/edu/stanford/nlp/pipeline/StanfordCoreNLPServer.java b/src/edu/stanford/nlp/pipeline/StanfordCoreNLPServer.java
index fb89df926d..c6e79b1cae 100644
--- a/src/edu/stanford/nlp/pipeline/StanfordCoreNLPServer.java
+++ b/src/edu/stanford/nlp/pipeline/StanfordCoreNLPServer.java
@@ -333,7 +333,10 @@ private Annotation getDocument(Properties props, HttpExchange httpExchange) thro
return annotation;
case "serialized":
String inputSerializerName = props.getProperty("inputSerializer", ProtobufAnnotationSerializer.class.getName());
- AnnotationSerializer serializer = MetaClass.create(inputSerializerName).createInstance();
+ if (!inputSerializerName.equals(ProtobufAnnotationSerializer.class.getName())) {
+ throw new IOException("Specifying an inputSerializer other than ProtobufAnnotationSerializer is now deprecated for security reasons. See https://github.com/stanfordnlp/CoreNLP/security/advisories/GHSA-wv35-hv9v-526p If you have need for a different class, please post about your use case on the CoreNLP github.");
+ }
+ AnnotationSerializer serializer = new ProtobufAnnotationSerializer();
Pair pair = serializer.read(httpExchange.getRequestBody());
return pair.first;
default:
diff --git a/src/edu/stanford/nlp/pipeline/demo/corenlp-brat.html b/src/edu/stanford/nlp/pipeline/demo/corenlp-brat.html
index 03d7101cd9..0b370ea582 100644
--- a/src/edu/stanford/nlp/pipeline/demo/corenlp-brat.html
+++ b/src/edu/stanford/nlp/pipeline/demo/corenlp-brat.html
@@ -16,8 +16,8 @@
-
-
+
+
@@ -32,7 +32,7 @@
- | ( | ' + response.triples[i][0] + '; | '; - gloss += '' + response.triples[i][1] + '; | '; - gloss += '' + response.triples[i][2] + ' | ) |
version 4.5.8
+ version 4.5.9