Skip to content

Commit

Permalink
SVN: merge trunk-3-5 to trunk-4-0
Browse files Browse the repository at this point in the history 
git-svn-id: https://svn.javlin.eu/svn/cloveretl.opensource/trunk-4-0@16613 a09ad3ba-1a0f-0410-b1b9-c67202f10d70
  • Loading branch information
krivanekm committed Nov 12, 2014
2 parents 584e7d3 + a48326a commit a1f161c
Show file tree
Hide file tree
Showing 10 changed files with 313 additions and 65 deletions.
7 changes: 7 additions & 0 deletions cloveretl.component/src/org/jetel/component/DBInputTable.java
View file
Expand Up @@ -26,6 +26,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jetel.connection.jdbc.SQLDataParser;
import org.jetel.connection.jdbc.SQLIncremental;
import org.jetel.data.DataRecord;
import org.jetel.data.DataRecordFactory;
import org.jetel.data.Defaults;
Expand Down Expand Up @@ -531,6 +532,12 @@ public ConfigurationStatus checkConfig(ConfigurationStatus status) {
}
status.add(problem);
}

if (sqlQuery != null && incrementalKeyDef != null && !sqlQuery.contains(SQLIncremental.INCREMENTAL_KEY_INDICATOR)) {
status.add(new ConfigurationProblem("Incremental file and key is specified but sql query doesn't contain incremental key indicator ("
+SQLIncremental.INCREMENTAL_KEY_INDICATOR+"). The component will erase incremental key from the incremental file.",
Severity.WARNING, this, Priority.NORMAL, XML_SQLQUERY_ATTRIBUTE));
}
}
} catch (ComponentNotReadyException e) {
ConfigurationProblem problem = new ConfigurationProblem(ExceptionUtils.getMessage(e), ConfigurationStatus.Severity.ERROR, this, ConfigurationStatus.Priority.NORMAL);
Expand Down
42 changes: 37 additions & 5 deletions cloveretl.connection/src/org/jetel/connection/jdbc/SQLCloverStatement.java
View file
Expand Up @@ -127,7 +127,7 @@ public SQLCloverStatement(SqlConnection connection, String query, DataRecord inR
this.connection = connection;
this.query = query;
this.record = inRecord;
returnResult = query.toLowerCase().contains(RETURNING_KEY_WORD);
returnResult = indexOfReturning(query) != -1;
queryType = QueryType.fromSqlQuery(query);
}

Expand Down Expand Up @@ -192,7 +192,7 @@ private void initTransMap() throws ComponentNotReadyException{
*/
public void init() throws ComponentNotReadyException, SQLException{
if (isInitialized) return;
int ri = query.toLowerCase().indexOf(RETURNING_KEY_WORD);
int ri = indexOfReturning(query);
if (ri != -1 && autoGeneratedColumn != null) {
logger.warn("Autogenerated columns defined in both \"sqlQuery\" and "
+ "\"autoGeneratedColumns\" attributes --> getting value from "
Expand Down Expand Up @@ -251,12 +251,11 @@ public void init() throws ComponentNotReadyException, SQLException{

//autogenerated columns
if (returnResult && autoGeneratedColumn == null) {
autoGeneratedColumn = sqlQuery.substring(sqlQuery.toLowerCase().indexOf(
RETURNING_KEY_WORD) + RETURNING_KEY_WORD.length()).trim().split("\\s*,\\s*");
autoGeneratedColumn = sqlQuery.substring(indexOfReturning(sqlQuery) + RETURNING_KEY_WORD.length()).trim().split("\\s*,\\s*");
}

if (returnResult) {
sqlQuery = sqlQuery.substring(0, sqlQuery.toString().toLowerCase().indexOf(RETURNING_KEY_WORD));
sqlQuery = sqlQuery.substring(0, indexOfReturning(sqlQuery));
if (queryType == QueryType.INSERT) {
autoKeyGenerator = new AutoKeyGenerator(connection, sqlQuery, autoGeneratedColumn);
autoKeyGenerator.setLogger(logger);
Expand Down Expand Up @@ -770,6 +769,39 @@ private Pattern getTableNamePattern() {
return Pattern.compile("(?:from|into|update)\\s+" +
connection.getJdbcSpecific().getDbFieldPattern(), Pattern.CASE_INSENSITIVE);
}

/**
* Best-effort method that searches given sql query for 'returning' statement. Search goes from the back.
* Created to fix CLO-4847.
* @param sql
* @return index of the returning clause, -1 if the returning clause is not present
*/
private int indexOfReturning(String sql) {
sql = sql.toLowerCase();
int ri = sql.length();

//search from the back and skip occurrences of 'returning' that are not properly delimited
for (;;) {
ri = sql.lastIndexOf(RETURNING_KEY_WORD, ri - RETURNING_KEY_WORD.length());
if (ri == -1) {
return -1;
}
try {
char charBefore = sql.charAt(ri-1);
char charAfter = sql.charAt(ri + RETURNING_KEY_WORD.length());
if (isReturningDelimiter(charBefore) && isReturningDelimiter(charAfter)) {
return ri;
}
} catch (IndexOutOfBoundsException e) {
// invalid query
return -1;
}
}
}

private boolean isReturningDelimiter(char c) {
return Character.isWhitespace(c) || !Character.isJavaIdentifierPart(c);
}
}


1 change: 1 addition & 0 deletions cloveretl.engine/.classpath
View file
Expand Up @@ -34,6 +34,7 @@
<classpathentry kind="lib" path="lib/truezip-swing-7.7.5.jar"/>
<classpathentry kind="lib" path="lib/sardine-5.0.2.jar"/>
<classpathentry kind="lib" path="lib/jets3t-0.9.0.jar"/>
<classpathentry kind="lib" path="lib/java-xmlbuilder-0.4.jar"/>
<classpathentry exported="true" kind="lib" path="lib/httpclient-4.3.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/httpcore-4.3.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/httpmime-4.3.2.jar"/>
Expand Down
Binary file added cloveretl.engine/lib/java-xmlbuilder-0.4.jar
View file
Binary file not shown.
202 changes: 202 additions & 0 deletions cloveretl.engine/lib/java-xmlbuilder-LICENSE.txt
View file
@@ -0,0 +1,202 @@

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
69 changes: 36 additions & 33 deletions cloveretl.engine/src/org/jetel/logger/SafeLogLayout.java
View file
Expand Up @@ -46,29 +46,29 @@ public boolean ignoresThrowable() {

@Override
public String format(LoggingEvent event) {
String formattedMessage = null;

// if we have a text log
if (event.getMessage() instanceof String) {
// obfuscate the stack trace, if there is any
ThrowableInformation throwableInformation = null;
if (event.getThrowableInformation() != null) {
String[] stringRepresentation = event.getThrowableInformation().getThrowableStrRep();

String[] safeStringRepresentation = null;
if (stringRepresentation != null) {
safeStringRepresentation = new String[stringRepresentation.length];
for (int i=0; i < stringRepresentation.length; i++) {
safeStringRepresentation[i] = SafeLogUtils.obfuscateSensitiveInformation(stringRepresentation[i]);
}
}

throwableInformation = new ThrowableInformation(safeStringRepresentation);
}

if (event.getMessage() instanceof String) {
// obfuscate password in the message itself
String message = event.getRenderedMessage();
String safeMessage = SafeLogUtils.obfuscateSensitiveInformation(message);

// obfuscate the stack trace, if there is any
ThrowableInformation throwableInformation = null;
if (event.getThrowableInformation() != null) {
String[] stringRepresentation = event.getThrowableInformation().getThrowableStrRep();

String[] safeStringRepresentation = null;
if (stringRepresentation != null) {
safeStringRepresentation = new String[stringRepresentation.length];
for (int i=0; i < stringRepresentation.length; i++) {
safeStringRepresentation[i] = SafeLogUtils.obfuscateSensitiveInformation(stringRepresentation[i]);
}
}

throwableInformation = new ThrowableInformation(safeStringRepresentation);
}

// create new log event from obfuscated texts
LoggingEvent safeEvent = new LoggingEvent(event.fqnOfCategoryClass,
Logger.getLogger(event.getLoggerName()),
Expand All @@ -80,22 +80,25 @@ public String format(LoggingEvent event) {
event.getNDC(),
null,
event.getProperties());

// handle the message by parent layout. NOTE: throwable is not handled - we need to do it ourselves
StringBuilder b = new StringBuilder(super.format(safeEvent));

// go through the stack trace and add it line by line to the result string
if (safeEvent.getThrowableInformation() != null) {
String[] safeStringRepresentation = safeEvent.getThrowableStrRep();

for (int i=0; i < safeEvent.getThrowableInformation().getThrowableStrRep().length; i++) {
b.append(safeStringRepresentation[i]).append("\n");
}
}

return b.toString();

// handle the message by parent layout. NOTE: throwable is not handled - we need to do it ourselves
formattedMessage = super.format(safeEvent);
} else {
// handle the message by parent layout. NOTE: throwable is not handled - we need to do it ourselves
formattedMessage = super.format(event);
}

// ignoresThrowable() returns false, we need to append the stacktrace to the formatted message
if (throwableInformation != null) {
StringBuilder b = new StringBuilder(formattedMessage);
String[] safeStringRepresentation = throwableInformation.getThrowableStrRep();

for (int i=0; i < safeStringRepresentation.length; i++) {
b.append(safeStringRepresentation[i]).append("\n");
}
formattedMessage = b.toString();
}
return super.format(event);

return formattedMessage;
}
}

0 comments on commit a1f161c

Please sign in to comment.