Skip to content

Commit 31697fe

Browse files
StoertebekerHSTskavanagh
authored andcommitted
Add Manage System Status "DNS lookup Failed"
- add HOST_FAIL_STATUS in HostSystem.java Update .gitignore for Eclipse Project Setting
1 parent 3522bf4 commit 31697fe

File tree

6 files changed

+25
-2
lines changed

6 files changed

+25
-2
lines changed

.gitignore

+8-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,11 @@
77
target/*
88
.idea/*
99
*.iml
10-
*.DS_Store
10+
*.DS_Store
11+
/target/
12+
/bin/
13+
14+
# Eclipse Project Setting #
15+
.classpath
16+
.project
17+
.settings/*

src/main/java/com/keybox/manage/model/HostSystem.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ public class HostSystem {
3838
public static final String PUBLIC_KEY_FAIL_STATUS="KEYAUTHFAIL";
3939
public static final String GENERIC_FAIL_STATUS="GENERICFAIL";
4040
public static final String SUCCESS_STATUS="SUCCESS";
41+
public static final String HOST_FAIL_STATUS="HOSTFAIL";
4142

4243

4344

@@ -70,7 +71,7 @@ public String getHost() {
7071
return host;
7172
}
7273

73-
public void setHost(String host) {
74+
public void setHost(String host){
7475
this.host = host;
7576
}
7677

src/main/java/com/keybox/manage/util/SSHUtil.java

+6
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,9 @@ public static HostSystem authAndAddPubKey(HostSystem hostSystem, String passphra
233233
hostSystem.setStatusCd(HostSystem.PUBLIC_KEY_FAIL_STATUS);
234234
} else if (e.getMessage().toLowerCase().contains("auth fail") || e.getMessage().toLowerCase().contains("auth cancel")) {
235235
hostSystem.setStatusCd(HostSystem.AUTH_FAIL_STATUS);
236+
} else if (e.getMessage().toLowerCase().contains("unknownhostexception")){
237+
hostSystem.setErrorMsg("DNS Lookup Failed");
238+
hostSystem.setStatusCd(HostSystem.HOST_FAIL_STATUS);
236239
} else {
237240
hostSystem.setStatusCd(HostSystem.GENERIC_FAIL_STATUS);
238241
}
@@ -466,6 +469,9 @@ public static HostSystem openSSHTermOnSystem(String passphrase, String password,
466469
hostSystem.setStatusCd(HostSystem.PUBLIC_KEY_FAIL_STATUS);
467470
} else if (e.getMessage().toLowerCase().contains("auth fail") || e.getMessage().toLowerCase().contains("auth cancel")) {
468471
hostSystem.setStatusCd(HostSystem.AUTH_FAIL_STATUS);
472+
} else if (e.getMessage().toLowerCase().contains("unknownhostexception")){
473+
hostSystem.setErrorMsg("DNS Lookup Failed");
474+
hostSystem.setStatusCd(HostSystem.HOST_FAIL_STATUS);
469475
} else {
470476
hostSystem.setStatusCd(HostSystem.GENERIC_FAIL_STATUS);
471477
}

src/main/webapp/admin/secure_shell.jsp

+3
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,9 @@
116116
<s:if test="currentSystemStatus!=null && currentSystemStatus.statusCd=='GENERICFAIL'">
117117
$("#error_dialog").modal();
118118
</s:if>
119+
<s:if test="currentSystemStatus!=null && currentSystemStatus.statusCd=='HOSTFAIL'">
120+
$("#error_dialog").modal();
121+
</s:if>
119122
<s:elseif test="pendingSystemStatus!=null">
120123
<s:if test="pendingSystemStatus.statusCd=='AUTHFAIL'">
121124
$("#set_password_dialog").modal();

src/main/webapp/admin/upload_result.jsp

+3
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,9 @@
9898
<s:elseif test="statusCd=='AUTHFAIL'">
9999
<div class="warning">Authentication Failed</div>
100100
</s:elseif>
101+
<s:elseif test="statusCd=='HOSTFAIL'">
102+
<div class="error">DNS Lookup Failed</div>
103+
</s:elseif>
101104
<s:elseif test="statusCd=='KEYAUTHFAIL'">
102105
<div class="warning">Passphrase Authentication Failed</div>
103106
</s:elseif>

src/main/webapp/manage/view_systems.jsp

+3
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,9 @@
137137
<s:elseif test="statusCd=='AUTHFAIL'">
138138
<div class="warning">Authentication Failed</div>
139139
</s:elseif>
140+
<s:elseif test="statusCd=='HOSTFAIL'">
141+
<div class="error">DNS Lookup Failed</div>
142+
</s:elseif>
140143
<s:elseif test="statusCd=='KEYAUTHFAIL'">
141144
<div class="warning">Passphrase Authentication Failed</div>
142145
</s:elseif>

0 commit comments

Comments
 (0)