Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ private AsyncFunction<Response, AuthStatus, AuthenticationException> onValidateS
public Promise<AuthStatus, AuthenticationException> apply(Response response) {
try {
if (!response.getStatus().isSuccessful()) {
LOG.error("REST validation call returned non HTTP 200 response",
LOG.error("REST validation call returned non HTTP 200 response: {}",
response.getEntity().getString());
return newResultPromise(SEND_FAILURE);
}
Expand Down Expand Up @@ -365,7 +365,7 @@ private Function<Response, AuthStatus, AuthenticationException> onUserResponse(f
public AuthStatus apply(Response response) throws AuthenticationException {
if (!response.getStatus().isSuccessful()) {
try {
LOG.error("REST validation call returned non HTTP 200 response",
LOG.error("REST validation call returned non HTTP 200 response: {}",
response.getEntity().getString());
return SEND_FAILURE;
} catch (IOException e) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Copyright 2015 ForgeRock AS.
* Portions Copyrighted 2026 3A Systems, LLC
*/
package org.forgerock.selfservice.core.crypto;

Expand Down Expand Up @@ -121,14 +122,14 @@ public boolean fieldMatches(String plaintextfield, String storedField) {

saltLength = decodedBytes.length - digestSize;
if (saltLength <= 0) {
logger.error("Invalid decoded stored field", storedField);
logger.error("Invalid decoded stored field: {}", storedField);
return false;
}
saltBytes = new byte[saltLength];
System.arraycopy(decodedBytes, 0, digestBytes, 0, digestSize);
System.arraycopy(decodedBytes, digestSize, saltBytes, 0, saltLength);
} catch (Exception e) {
logger.error("Cannot decode stored field", storedField, e);
logger.error("Cannot decode stored field: {}", storedField, e);
return false;
}

Expand All @@ -145,7 +146,7 @@ public boolean fieldMatches(String plaintextfield, String storedField) {
try {
userDigestBytes = messageDigest.digest(plainPlusSalt);
} catch (Exception e) {
logger.error("Cannot encode field", storedField, e);
logger.error("Cannot encode field: {}", storedField, e);
return false;
} finally {
Arrays.fill(plainPlusSalt, (byte) 0);
Expand Down
7 changes: 4 additions & 3 deletions persistit/core/src/main/java/com/persistit/util/Util.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
* 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.
* Portions Copyrighted 2026 3A Systems, LLC
*/

package com.persistit.util;
Expand Down Expand Up @@ -581,7 +582,7 @@ public static int rangeCheck(final int value, final int min, final int max) {
throw new IllegalArgumentException(String.format("Value must be greater than or equal to %,d: %,d", min,
value));
} else {
throw new IllegalArgumentException(String.format("Value must be between %d and %d, inclusive: ", min, max,
throw new IllegalArgumentException(String.format("Value must be between %d and %d, inclusive: %d", min, max,
value));
}
}
Expand All @@ -598,7 +599,7 @@ public static long rangeCheck(final long value, final long min, final long max)
throw new IllegalArgumentException(String.format("Value must be greater than or equal to %,d: %,d", min,
value));
} else {
throw new IllegalArgumentException(String.format("Value must be between %d and %d, inclusive: ", min, max,
throw new IllegalArgumentException(String.format("Value must be between %d and %d, inclusive: %d", min, max,
value));
}
}
Expand All @@ -615,7 +616,7 @@ public static float rangeCheck(final float value, final float min, final float m
throw new IllegalArgumentException(String.format("Value must be greater than or equal to %,f: %,f", min,
value));
} else {
throw new IllegalArgumentException(String.format("Value must be between %f and %f, inclusive: ", min, max,
throw new IllegalArgumentException(String.format("Value must be between %f and %f, inclusive: %f", min, max,
value));
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
* with the fields enclosed by brackets [] replaced by
* your own identifying information:
* "Portions Copyrighted [year] [name of copyright owner]"
*
* Portions Copyrighted 2026 3A Systems, LLC
*/

package org.forgerock.script.javascript;
Expand Down Expand Up @@ -49,14 +51,14 @@ public SLF4JErrorReporter(ErrorReporter chainedReporter) {

public void warning(String message, String sourceName, int line, String lineSource,
int lineOffset) {
logger.warn("", new Object[] { message, sourceName, line, lineSource, lineOffset });
logger.warn("{} ({}#{}): {} [offset {}]", new Object[] { message, sourceName, line, lineSource, lineOffset });
if (chainedReporter != null) {
chainedReporter.warning(message, sourceName, line, lineSource, lineOffset);
}
}

public void error(String message, String sourceName, int line, String lineSource, int lineOffset) {
logger.error("", new Object[] { message, sourceName, line, lineSource, lineOffset });
logger.error("{} ({}#{}): {} [offset {}]", new Object[] { message, sourceName, line, lineSource, lineOffset });
if (chainedReporter != null) {
chainedReporter.error(message, sourceName, line, lineSource, lineOffset);
} else {
Expand Down
Loading