Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: remove warnings in attlsfilter (v3) #3980

Merged
merged 2 commits into from
Feb 6, 2025
Merged

chore: remove warnings in attlsfilter (v3) #3980

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
166ab47
remove warnings in attlsfilter
Feb 5, 2025
3085371
Merge branch 'v3.x.x' into reboot/v3-attls-filter
pablocarle Feb 6, 2025
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
7 changes: 4 additions & 3 deletions apiml-tomcat-common/src/main/java/org/zowe/apiml/filter/AttlsFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.apache.tomcat.util.codec.binary.Base64;
import org.springframework.lang.NonNull;
import org.springframework.web.filter.OncePerRequestFilter;
import org.zowe.commons.attls.InboundAttls;

Expand All @@ -25,6 +25,7 @@
import java.security.cert.CertificateException;
import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
import java.util.Base64;


/**
Expand All @@ -34,7 +35,7 @@
public class AttlsFilter extends OncePerRequestFilter {

@Override
protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
protected void doFilterInternal(@NonNull HttpServletRequest request, @NonNull HttpServletResponse response, @NonNull FilterChain filterChain) throws ServletException, IOException {
try {
byte[] certificate = InboundAttls.getCertificate();
if (certificate != null && certificate.length > 0) {
Expand All @@ -54,7 +55,7 @@ public void populateRequestWithCertificate(HttpServletRequest request, byte[] ra
%s
-----END CERTIFICATE-----
""",
Base64.encodeBase64String(rawCertificate)
Base64.getEncoder().encodeToString(rawCertificate)
);

var certificate = (X509Certificate) CertificateFactory
Expand Down
Loading