Skip to content

Commit 8b8ec59

Browse files
committed
Ask the database how long the column should be
Instead of hardcoding a number
1 parent a8ef465 commit 8b8ec59

File tree

1 file changed

+15
-11
lines changed

1 file changed

+15
-11
lines changed

lib/msf/core/db_manager/session.rb

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ def create_mdm_session_from_session(opts)
174174
host = find_or_create_host(h_opts)
175175
sess_data = {
176176
datastore: session.exploit_datastore.to_h,
177-
desc: session.info,
177+
desc: truncate_session_desc(session.info),
178178
host_id: host.id,
179179
last_seen: Time.now.utc,
180180
local_id: session.sid,
@@ -201,11 +201,6 @@ def create_mdm_session_from_session(opts)
201201
sess_data[:via_exploit] = sess_data[:datastore]['ParentModule']
202202
end
203203

204-
# Truncate the session data if necessary
205-
if sess_data[:desc]
206-
sess_data[:desc] = sess_data[:desc][0,255]
207-
end
208-
209204
s = ::Mdm::Session.create!(sess_data)
210205
s
211206
}
@@ -218,7 +213,7 @@ def create_mdm_session_from_host(opts)
218213
sess_data = {
219214
host_id: host.id,
220215
stype: opts[:stype],
221-
desc: opts[:desc],
216+
desc: truncate_session_desc(opts[:desc]),
222217
platform: opts[:platform],
223218
via_payload: opts[:via_payload],
224219
via_exploit: opts[:via_exploit],
@@ -230,13 +225,22 @@ def create_mdm_session_from_host(opts)
230225
close_reason: opts[:close_reason],
231226
}
232227

233-
# Truncate the session data if necessary
234-
if sess_data[:desc]
235-
sess_data[:desc] = sess_data[:desc][0,255]
236-
end
237228

238229
s = ::Mdm::Session.create!(sess_data)
239230
s
240231
}
241232
end
233+
234+
# Truncate the session data if necessary
235+
#
236+
# @param desc [String]
237+
# @return [String] +desc+ truncated to the max length of the desc column
238+
def truncate_session_desc(desc)
239+
# Truncate the session data if necessary
240+
if desc
241+
desc = desc[0, ::Mdm::Session.columns_hash['desc'].limit]
242+
end
243+
desc
244+
end
245+
242246
end

0 commit comments

Comments
 (0)