Skip to content

Integration/eclipse bug fixes #249

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

Open
cx-aniket-shinde wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Integration/eclipse bug fixes #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
644dae9
Fix: Route authentication logs to Eclipse Error Log (AST-136023) (#244)
cx-aniket-shinde Apr 20, 2026
0260961
Fix: Clear detail panels on severity filter change (AST-136035) (#245)
cx-aniket-shinde Apr 20, 2026
72be7a1
Fix: Truncate long custom state names in filter menu (AST-137779) (#246)
cx-aniket-shinde Apr 20, 2026
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
40 changes: 23 additions & 17 deletions ...tests/src/test/java/checkmarx/ast/eclipse/plugin/tests/unit/runner/AuthenticatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@

import org.junit.jupiter.api.Test;
import org.mockito.MockedConstruction;
import org.mockito.MockedStatic;
import org.mockito.Mockito;
import org.slf4j.Logger;

import com.checkmarx.ast.wrapper.CxException;
import com.checkmarx.ast.wrapper.CxWrapper;
import com.checkmarx.eclipse.runner.Authenticator;
import com.checkmarx.eclipse.utils.CxLogger;
import com.checkmarx.eclipse.utils.PluginConstants;

class AuthenticatorTest {
Expand All @@ -24,14 +26,15 @@ void testDoAuthenticationSuccess() throws Exception {

try (MockedConstruction<CxWrapper> mocked =
Mockito.mockConstruction(CxWrapper.class,
(mock, context) -> when(mock.authValidate()).thenReturn("SUCCESS"))) {
(mock, context) -> when(mock.authValidate()).thenReturn("SUCCESS"));
MockedStatic<CxLogger> mockedCxLogger = Mockito.mockStatic(CxLogger.class)) {

Authenticator authenticator = new Authenticator(mockLogger);

String result = authenticator.doAuthentication("dummyKey", "--param");

assertEquals("SUCCESS", result);
verify(mockLogger).info("Authentication Status: SUCCESS");
mockedCxLogger.verify(() -> CxLogger.info(String.format(PluginConstants.INFO_AUTHENTICATION_STATUS, "SUCCESS")));
}
}

Expand All @@ -43,17 +46,18 @@ void testDoAuthenticationIOException() throws Exception {
try (MockedConstruction<CxWrapper> mocked =
Mockito.mockConstruction(CxWrapper.class,
(mock, context) -> when(mock.authValidate())
.thenThrow(new IOException("IO error")))) {
.thenThrow(new IOException("IO error")));
MockedStatic<CxLogger> mockedCxLogger = Mockito.mockStatic(CxLogger.class)) {

Authenticator authenticator = new Authenticator(mockLogger);

String result = authenticator.doAuthentication("dummyKey", "--param");

assertEquals("IO error", result);
verify(mockLogger).error(
eq(String.format(PluginConstants.ERROR_AUTHENTICATING_AST, "IO error")),
any(IOException.class)
);
mockedCxLogger.verify(() -> CxLogger.error(
eq(String.format(PluginConstants.ERROR_AUTHENTICATING_AST, "IO error")),
any(IOException.class)
));
}
}

Expand All @@ -65,17 +69,18 @@ void testDoAuthenticationInterruptedException() throws Exception {
try (MockedConstruction<CxWrapper> mocked =
Mockito.mockConstruction(CxWrapper.class,
(mock, context) -> when(mock.authValidate())
.thenThrow(new InterruptedException("Interrupted")))) {
.thenThrow(new InterruptedException("Interrupted")));
MockedStatic<CxLogger> mockedCxLogger = Mockito.mockStatic(CxLogger.class)) {

Authenticator authenticator = new Authenticator(mockLogger);

String result = authenticator.doAuthentication("dummyKey", "--param");

assertEquals("Interrupted", result);
verify(mockLogger).error(
eq(String.format(PluginConstants.ERROR_AUTHENTICATING_AST, "Interrupted")),
any(InterruptedException.class)
);
mockedCxLogger.verify(() -> CxLogger.error(
eq(String.format(PluginConstants.ERROR_AUTHENTICATING_AST, "Interrupted")),
any(InterruptedException.class)
));
}
}

Expand All @@ -87,17 +92,18 @@ void testDoAuthenticationCxException() throws Exception {
try (MockedConstruction<CxWrapper> mocked =
Mockito.mockConstruction(CxWrapper.class,
(mock, context) -> when(mock.authValidate())
.thenThrow(new CxException(1, "Cx error")))) {
.thenThrow(new CxException(1, "Cx error")));
MockedStatic<CxLogger> mockedCxLogger = Mockito.mockStatic(CxLogger.class)) {

Authenticator authenticator = new Authenticator(mockLogger);

String result = authenticator.doAuthentication("dummyKey", "--param");

assertEquals("Cx error", result);
verify(mockLogger).error(
eq(String.format(PluginConstants.ERROR_AUTHENTICATING_AST, "Cx error")),
any(CxException.class)
);
mockedCxLogger.verify(() -> CxLogger.error(
eq(String.format(PluginConstants.ERROR_AUTHENTICATING_AST, "Cx error")),
any(CxException.class)
));
}
}

Expand Down
4 changes: 2 additions & 2 deletions checkmarx-ast-eclipse-plugin/src/com/checkmarx/eclipse/runner/Authenticator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ public String doAuthentication(String apiKey, String additionalParams) {
try {
CxWrapper wrapper = new CxWrapper(config, log);
String cxValidateOutput = wrapper.authValidate();
log.info(AUTH_STATUS + cxValidateOutput);
CxLogger.info(String.format(PluginConstants.INFO_AUTHENTICATION_STATUS, cxValidateOutput));
return cxValidateOutput;
} catch (IOException | InterruptedException | CxException e) {
log.error(String.format(PluginConstants.ERROR_AUTHENTICATING_AST, e.getMessage()), e);
CxLogger.error(String.format(PluginConstants.ERROR_AUTHENTICATING_AST, e.getMessage()), e);
return e.getMessage();
}
}
Expand Down
22 changes: 19 additions & 3 deletions checkmarx-ast-eclipse-plugin/src/com/checkmarx/eclipse/views/CheckmarxView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ public class CheckmarxView extends ViewPart implements EventHandler {
private Text commentText;
private DisplayModel rootModel;
private String selectedSeverity, selectedState;
private DisplayModel currentlyDisplayedItem;
private Button triageButton;
private SelectionAdapter triageButtonAdapter, codeBashingAdapter;
private Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
Expand Down Expand Up @@ -626,6 +627,13 @@ private void createResultViewPanel(Composite resultsComposite) {
combo_1.setLayoutData(gd_combo_1);

triageStateComboViewer = new ComboViewer(triageView, SWT.READ_ONLY);
triageStateComboViewer.setLabelProvider(new LabelProvider() {
@Override
public String getText(Object element) {
String s = element instanceof String ? (String) element : super.getText(element);
return s.length() > 50 ? s.substring(0, 47) + "..." : s;
}
});
Combo combo_2 = triageStateComboViewer.getCombo();
combo_2.setEnabled(true);
combo_2.setData(PluginConstants.DATA_ID_KEY, PluginConstants.TRIAGE_STATE_COMBO_ID);
Expand Down Expand Up @@ -1082,8 +1090,7 @@ private void createScanIdComboBox(Composite parent) {
scanIdComboViewer.setContentProvider(ArrayContentProvider.getInstance());
scanIdComboViewer.setInput(new ArrayList<>());

GridData gridData = new GridData();
gridData.widthHint = 520;
GridData gridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
scanIdComboViewer.getCombo().setLayoutData(gridData);

scanIdComboViewer.getCombo().addListener(SWT.DefaultSelection, new Listener() {
Expand Down Expand Up @@ -1386,6 +1393,7 @@ protected IStatus run(IProgressMonitor arg0) {

if (selectedItem.getResult() != null && selectedItem.getResult().getSimilarityId() != null) {
sync.asyncExec(() -> {
currentlyDisplayedItem = selectedItem;
createTriageSeverityAndStateCombos(selectedItem);
populateTriageChanges(selectedItem);
resultViewComposite.setVisible(true);
Expand Down Expand Up @@ -2473,6 +2481,8 @@ private Image findSeverityImage(DisplayModel model) {
private void listener(PluginListenerDefinition definition) {
switch (definition.getListenerType()) {
case FILTER_CHANGED:
updateResultsTree(definition.getResutls(), true);
break;
case GET_RESULTS:
updateResultsTree(definition.getResutls(), false);
break;
Expand All @@ -2489,9 +2499,15 @@ private void listener(PluginListenerDefinition definition) {

private void updateResultsTree(List<DisplayModel> results, boolean expand) {
sync.asyncExec(() -> {
if (currentlyDisplayedItem == null
|| currentlyDisplayedItem.getSeverity() == null
|| !FilterState.isSeverityEnabled(currentlyDisplayedItem.getSeverity())) {
resultViewComposite.setVisible(false);
attackVectorCompositePanel.setVisible(false);
}
Object[] expanded = resultsTree.getExpandedElements();
rootModel.children.clear();
rootModel.children.addAll(results);
Object[] expanded = resultsTree.getExpandedElements();
resultsTree.refresh();
if (expand) {
Set<String> expandedDMNames = new HashSet<>();
Expand Down
6 changes: 5 additions & 1 deletion ...t-eclipse-plugin/src/com/checkmarx/eclipse/views/actions/ActionFilterStatePreference.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public Menu getMenu(final Control parent) {

for (String customState : customStates) {
MenuItem item = new MenuItem(menu, SWT.CHECK);
item.setText(customState);
item.setText(truncate(customState));
item.setSelection(FilterState.isCustomStateSelected(customState));
item.addSelectionListener(new SelectionAdapter() {
@Override
Expand Down Expand Up @@ -127,4 +127,8 @@ public void widgetSelected(SelectionEvent e) {
public Menu getMenu(final Menu parent) {
return null;
}

private static String truncate(String text) {
return text.length() > 50 ? text.substring(0, 47) + "..." : text;
}
}
2 changes: 1 addition & 1 deletion checkmarx-ast-eclipse-plugin/src/com/checkmarx/eclipse/views/actions/ActionStartScan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ private String getCurrentGitBranch() {
*/
private boolean cxProjectMatchesWorkspaceProject() {
Results results = DataProvider.getInstance().getCurrentResults();
boolean noResultsInScan = results == null || results.getResults().isEmpty();
boolean noResultsInScan = results == null || results.getResults() == null || results.getResults().isEmpty();
boolean noFilesInWorkspace = ResourcesPlugin.getWorkspace().getRoot().getProjects().length == 0;

if (noResultsInScan || noFilesInWorkspace) {
Expand Down
Loading