4bcbdc54c9
This switches the Metasploit Framework to a Rails 3 backend. If you run into new problems (especially around Active Record or your postgresql gem) you should try first updating your Ruby installation to 1.9.3 and use a more recent 'pg' gem. If that fails, we'd love to see your bug report (just drop all the detail you can into an issue on GitHub). In the meantime, you can checkout the rails2 branch, which was branched from master immediately before this cutover. Squashed commit of the following: commit 5802ec851580341c6717dfea529027c12678d35f Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 23:30:12 2012 -0500 Enable MSF_BUNDLE_GEMS mode by default (set to N/F/0 to disable) commit 8102f98dce9eb0c73c4374e40dce09af7b51d060 Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 23:30:03 2012 -0500 Add a method to expand win32 file paths commit bda6479d154cf75572dd5de8b66bfde661a55de9 Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 18:53:44 2012 -0500 Fix 1.8.x compatibility commit 101ce4eb17bfdf755ef8c0a5198174668b6cd6fd Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 18:40:59 2012 -0500 Use verbose instead of stringio commit 5db467ffb593488285576d183b1662093e454b3e Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 18:30:06 2012 -0500 Hide the iconv warning, were stuck with it due to EBCDIC support commit 63b9cb20eb6a61daf4effb4c8d2761c16ff0c4e0 Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 18:29:58 2012 -0500 Dont use GEM_HOME by default commit ca49271c22c314a4465fff934334df18c704cbc0 Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 18:23:34 2012 -0500 Move Gemfile to root (there be dragons, lets find them) and catch failed bundler loads commit 34af04076a068e9f60c5526045ddbba5fca359fd Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 18:18:29 2012 -0500 Fallback to bundler when not running inside of a installer env commit ed1066a4f3f12fae7d4afc03eb1ab70ffe2f9cf3 Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 16:26:55 2012 -0500 Remove a mess of gems that were not actually required commit 21290a73926809e9049a59359449168f740d13d2 Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 15:59:10 2012 -0500 Hack around a gem() call that is well-intentioned but an obstacle in this case commit 8e414a8bfab9641c81088d22f73033be5b37a700 Author: Tod Beardsley <todb@metasploit.com> Date: Sun Apr 15 15:06:08 2012 -0500 Ruby, come on. Ducktype this. Please. Use interpolated strings to get the to_s behavior you don't get with just plussing. commit 0fa92c58750f8f84edbecfaab72cd2da5062743f Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 15:05:42 2012 -0500 Add new eventmachine/thin gems commit 819d5e7d45e0a16741d3852df3ed110b4d7abc44 Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 15:01:18 2012 -0500 Purge (reimport in a second) commit ea6f3f6c434537ca15b6c6674e31081e27ce7f86 Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 14:54:42 2012 -0500 Cleanup uncessary .so files (ext vs lib) commit d219330a3cc563e9da9f01fade016c9ed8cda21c Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 14:53:02 2012 -0500 PG gems built against the older installation environment commit d6e590cfa331ae7b25313ff1471c6148a6b36f3b Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 14:06:35 2012 -0500 Rename to include the version commit a893de222b97ce1222a55324f1811b0262aae2d0 Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 13:56:47 2012 -0500 Detect older installation environments and load the arch-lib directories into the search path commit 6444bba0a421921e2ebe2df2323277a586f9736f Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 13:49:25 2012 -0500 Merge in windows gems commit 95efbcfde220917bc7ee08e6083d7b383240d185 Author: Tod Beardsley <todb@metasploit.com> Date: Sun Apr 15 13:49:33 2012 -0500 Report_vuln shouldn't use :include in finder find_or_create_by doesn't take :include as a param. commit c5f99eb87f0874ef7d32fa42828841c9a714b787 Author: David Maloney <DMaloney@rapid7.com> Date: Sun Apr 15 12:44:09 2012 -0500 One more msised Mdm namespace issue commit 2184e2bbc3dd9b0993e8f21d2811a65a0c694d68 Author: David Maloney <DMaloney@rapid7.com> Date: Sun Apr 15 12:33:41 2012 -0500 Fixes some mroe Mdm namespace confusion Fixes #6626 commit 10cee17f391f398bb2be3409137ff7348c7a66ee Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 03:40:44 2012 -0500 Add robots gem (required by webscan) commit 327e674c83850101364c9cca8f8d16da1de3dfb5 Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 03:39:05 2012 -0500 Fix missing error checks commit a5a24641866e47e611d7636a3f19ba3b3ed10ac5 Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 01:15:37 2012 -0500 Reorder requires and add a method for injecting a new migration path commit 250a5fa5ae8cb05807af022aa4168907772c15f8 Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 00:56:09 2012 -0500 Remove missing constant (use string) and add gemcache cleaner commit 37ad6063fce0a41dddedb857fa49aa2c4834a508 Merge: d47ee824be0361Author: Tod Beardsley <todb@metasploit.com> Date: Sun Apr 15 00:40:16 2012 -0500 Merge branch 'master-clone' into rails3-clone commit d47ee82ad7e66de53dd3d3a65649cc37299a2479 Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 00:30:03 2012 -0500 cleanup leftovers from gems commit 6d883b5aa8a3a7ddbcde5bfd4521d57c5b30d3c2 Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 00:25:47 2012 -0500 MDM update with purged DBSave module commit 71e4f2d81f6da221b76150562a16c730888f5925 Author: HD Moore <hd_moore@rapid7.com> Date: Sat Apr 14 23:19:37 2012 -0500 Add new mdm commit 651cd5adac8211d65e0c8079371d8264e549533a Author: HD Moore <hd_moore@rapid7.com> Date: Sat Apr 14 23:19:13 2012 -0500 Update mdm commit 0191a8bd0acec30ddb2a9e9c291111a12378537f Author: HD Moore <hd_moore@rapid7.com> Date: Sat Apr 14 22:30:40 2012 -0500 This fixes numerous cases of missed Mdm:: prefixes on db objects commit a2a9bb3f2148622c135663dead80b3367b6f7695 Author: HD Moore <hd_moore@rapid7.com> Date: Sat Apr 14 18:30:18 2012 -0500 Add eventmachine commit 301ddeb12b906ed3c508613ca894347bedc3b499 Author: HD Moore <hd_moore@rapid7.com> Date: Sat Apr 14 18:18:12 2012 -0500 A nicer error for folks who need to upgrade pg commit fa6bde1e67b12e2d3d9978f59bbc98e0c1a1a707 Author: HD Moore <hd_moore@rapid7.com> Date: Sat Apr 14 17:54:55 2012 -0500 Remove bundler requirements commit 2e3ab9ed211303f1116e602b9a450141b71e56a4 Author: HD Moore <hd_moore@rapid7.com> Date: Sat Apr 14 17:35:38 2012 -0500 Pull in eventmachine with actual .so's this time commit 901fb33ff6b754ce2c2cfd51e3b0b669f6ec600b Author: HD Moore <hd_moore@rapid7.com> Date: Sat Apr 14 17:19:12 2012 -0500 Update deps, still need to add eventmachine commit 6b0e17068e8caa0601f3ef81e8dbdb672758fcbe Author: HD Moore <hd_moore@rapid7.com> Date: Sat Apr 14 13:07:06 2012 -0500 Handle older installer environments and only allow binary gems when the environment specifically asks for it commit b98eb7873a6342834840424699caa414a5cb172a Author: HD Moore <hd_moore@rapid7.com> Date: Sat Apr 14 04:05:13 2012 -0500 Bump version to -testing commit 6ac508c4ba3fdc278aaf8cfe2c58d01de3395431 Author: HD Moore <hd_moore@rapid7.com> Date: Sat Apr 14 02:25:09 2012 -0500 Remove msf3 subdir commit a27dac5067635a95b4cbb773df1985f2a2dc2c5a Author: HD Moore <hd_moore@rapid7.com> Date: Sat Apr 14 02:24:39 2012 -0500 Remove the old busted external commit 5fb5a0fc642b6c301934c319db854cc3145427a1 Author: HD Moore <hd_moore@rapid7.com> Date: Sat Apr 14 02:03:10 2012 -0500 Add the gemcache loader commit 09e2d89dfd09b9ac0c123fcc4e19816c86725627 Author: HD Moore <hd_moore@rapid7.com> Date: Sat Apr 14 02:02:23 2012 -0500 Purge gemfile/bundler configure in exchange for new gemcache setup commit 3cc0264e1cfb027b515d7f24b95a74b023bd905c Author: Tod Beardsley <todb@metasploit.com> Date: Thu Apr 12 14:11:45 2012 -0500 Mode change on modicon_ladder.apx commit c18b3d56efd639e461137acdc76b4b283fe978d4 Author: HD Moore <hd_moore@rapid7.com> Date: Thu Apr 12 01:38:56 2012 -0500 The go faster button commit ca2a67d51d6d4c7c3ca2e745f8b018279aef668a Merge: 674ee09b8129f9Author: Tod Beardsley <todb@metasploit.com> Date: Mon Apr 9 15:50:33 2012 -0500 Merge branch 'master-clone' into rails3-clone Picking up Packetfu upstream changes, all pretty minor commit 674ee097ab8a6bc9608bf377479ccd0b87e7302b Merge: e9513e5a26e844Author: Tod Beardsley <todb@metasploit.com> Date: Mon Apr 9 13:57:26 2012 -0500 Merge branch 'master-clone' into rails3-clone Conflicts: lib/msf/core/handler/reverse_http.rb lib/msf/core/handler/reverse_https.rb modules/auxiliary/scanner/discovery/udp_probe.rb modules/auxiliary/scanner/discovery/udp_sweep.rb Resolved conflicts with the reverse_http handlers and the udp probe / scanners byt favoring the more recent changes (which happened to be the intent anyway). The reverse_http and reverse_https changes were mine so I know what the intent was, and @dmaloney-r7 changed udp_probe and udp_sweep to use pcAnywhere_stat instead of merely pcAnywhere, so the intent is clear there as well. commit e9513e54f984fdb100c13b44a1724246779ccb76 Author: David Maloney <dmaloney@melodie.gateway.2wire.net> Date: Fri Apr 6 18:21:46 2012 -0500 Some fixes to how services get reported to prevent issues with the web interface commit adeb44e9aaf1a329a0e587d2b26e678398730422 Author: David Maloney <David_Maloney@rapid7.com> Date: Mon Apr 2 15:39:46 2012 -0500 Some corrections to pcAnywhere discovery modules to distinguish between the two services commit b13900176484fea8f5217a2ef925ae2ad9b7af47 Author: HD Moore <hd_moore@rapid7.com> Date: Sat Mar 31 12:03:21 2012 -0500 Enable additional migration-path parameters, use a temporary directory to bring the database online commit 526b4c56883f461417f71269404faef38639917c Author: David Maloney <David_Maloney@rapid7.com> Date: Wed Mar 28 23:24:56 2012 -0500 A bunch of Mdsm fixes for .kind_of? calls, to make sure we ponit to the right place commit 2cf3143370af808637d164ce59400605300f922c Author: HD Moore <hd_moore@rapid7.com> Date: Mon Mar 26 16:22:09 2012 -0500 Check for ruby 2.0 as well as 1.9 for encoding override commit 4d0f51b76d89f00f7acbce6b1f00dc6e4c4545ee Author: HD Moore <hd_moore@rapid7.com> Date: Mon Mar 26 15:36:04 2012 -0500 Remove debug statement commit f5d2335e7745aa1a354f4d6c8fc9d0b3876c472a Author: HD Moore <hd_moore@rapid7.com> Date: Mon Mar 26 15:01:55 2012 -0500 Be explicit about the Mdm namespace commit bc8be225606d6ea38dd2a85ab4310c1c181a94ee Author: hdm <hdm@hypo.(none)> Date: Mon Mar 26 11:49:51 2012 -0500 Precalculate some uri strings in case the 1000-round generation fails commit 4254f419723349ffb93e4aebdaeabbd7d66bf8c0 Author: Trevor Rosen <Trevor_Rosen@rapid7.com> Date: Sat Mar 24 14:03:44 2012 -0500 Removed some non-namespaced calls to Host commit c8190e1bb8ad365fb0d7a1c4a9173e6c739be85c Author: HD Moore <hd_moore@rapid7.com> Date: Tue Mar 20 00:37:00 2012 -0500 Purge the rvmrc, this is causing major headaches commit 76df18588917b7150a3bedf2569710a80bab51f8 Author: HD Moore <hd_moore@rapid7.com> Date: Tue Mar 20 00:31:52 2012 -0500 Switch .rvmrc to the shipping 1.9.3 version commit7124971d00Author: David Maloney <David_Maloney@rapid7.com> Date: Mon Mar 12 16:56:40 2012 -0500 Adds mixin for looking up Mime Types by extension commitb7ca835316Merge:a0b0c756b9a219Author: Matt Buck <techpeace@gmail.com> Date: Tue Mar 6 19:38:53 2012 -0600 Merge from develop. commita0b0c7528dAuthor: Trevor Rosen <Trevor_Rosen@rapid7.com> Date: Tue Mar 6 11:08:59 2012 -0600 Somehow migration file is new? commit84d2b3cb1aAuthor: David Maloney <David_Maloney@rapid7.com> Date: Wed Feb 29 16:38:55 2012 -0600 Added ability to specify headers to redirects in http server commite50d27cda8Author: HD Moore <hd_moore@rapid7.com> Date: Sat Feb 4 04:44:50 2012 -0600 Tweak the event dispatcher to enable customer events without a category and trigger http request events from the main exploit mixin. Experimental commit0e4fd2040dAuthor: Matt Buck <Matthew_Buck@rapid7.com> Date: Thu Feb 2 22:09:05 2012 -0600 Change Msm -> Mdm in migrations. This is what was preventing migrations from finishing on first boot. commitc94a2961d0Author: Trevor Rosen <Trevor_Rosen@rapid7.com> Date: Wed Feb 1 12:48:48 2012 -0600 Changed Gemfile to use new gem name commit245c2063f0Author: Trevor Rosen <Trevor_Rosen@rapid7.com> Date: Wed Feb 1 12:47:42 2012 -0600 Did find/replace for final namespace of Mdm commit6ed9bf8430Author: Trevor Rosen <Trevor_Rosen@rapid7.com> Date: Tue Jan 24 10:47:44 2012 -0600 Fix a bunch of namespace issues commit2fe08d9e42Author: Matt Buck <Matthew_Buck@rapid7.com> Date: Fri Jan 20 14:37:37 2012 -0600 Update Msm contstants in migrations for initial DB builds. commit4cc6b8fb04Author: Matt Buck <Matthew_Buck@rapid7.com> Date: Fri Jan 20 14:37:25 2012 -0600 Update Gemfile.lock. commit1cc655b678Author: Trevor Rosen <Trevor_Rosen@rapid7.com> Date: Thu Jan 19 11:48:29 2012 -0600 Errant Workspaces needed namespace commit607a782855Author: Trevor Rosen <Trevor_Rosen@rapid7.com> Date: Tue Jan 17 15:44:02 2012 -0600 Refactored all models to use the new namespace * Every model using DBManager::* namespace is now Msm namespace * Almost all of this in msf/base/core * Some in modules commita690cd959bAuthor: Trevor Rosen <Trevor_Rosen@rapid7.com> Date: Tue Jan 17 13:41:44 2012 -0600 Move bundler setup commitdae115cc8fAuthor: Trevor Rosen <Trevor_Rosen@rapid7.com> Date: Mon Jan 9 15:51:07 2012 -0600 Moved ActiveSupport dep to gem commitd32f8edb6eAuthor: Trevor Rosen <Trevor_Rosen@rapid7.com> Date: Mon Jan 9 14:40:05 2012 -0600 Removed model require file commitd0c74cff8cAuthor: Trevor Rosen <Trevor_Rosen@rapid7.com> Date: Tue Jan 3 16:06:10 2012 -0600 Update some more finds commit4eb79ea6b5Author: Trevor Rosen <Trevor_Rosen@rapid7.com> Date: Tue Jan 3 14:21:15 2012 -0600 Yet another dumb commit commita75febcb59Author: Trevor Rosen <trevor@catapult-creative.com> Date: Thu Dec 29 19:20:51 2011 -0600 Fixing deletion commitdc139ff2fdAuthor: Trevor Rosen <trevor@catapult-creative.com> Date: Wed Dec 7 17:06:45 2011 -0600 Fixed erroneous commit commit531c1e611cAuthor: Trevor Rosen <trevor@catapult-creative.com> Date: Mon Nov 21 16:11:35 2011 -0600 Remove AR patch stuff; attempting to debug non-connection between MSF and Pro commit4586112241Author: Trevor Rosen <trevor@catapult-creative.com> Date: Fri Nov 18 16:17:27 2011 -0600 Drop ActiveRecord/ActiveSupport in preparation for upgrade
341 lines
11 KiB
Ruby
341 lines
11 KiB
Ruby
require 'net/ssh/ruby_compat'
|
|
require 'net/ssh/transport/openssl'
|
|
|
|
module Net; module SSH
|
|
|
|
# Net::SSH::Buffer is a flexible class for building and parsing binary
|
|
# data packets. It provides a stream-like interface for sequentially
|
|
# reading data items from the buffer, as well as a useful helper method
|
|
# for building binary packets given a signature.
|
|
#
|
|
# Writing to a buffer always appends to the end, regardless of where the
|
|
# read cursor is. Reading, on the other hand, always begins at the first
|
|
# byte of the buffer and increments the read cursor, with subsequent reads
|
|
# taking up where the last left off.
|
|
#
|
|
# As a consumer of the Net::SSH library, you will rarely come into contact
|
|
# with these buffer objects directly, but it could happen. Also, if you
|
|
# are ever implementing a protocol on top of SSH (e.g. SFTP), this buffer
|
|
# class can be quite handy.
|
|
class Buffer
|
|
# This is a convenience method for creating and populating a new buffer
|
|
# from a single command. The arguments must be even in length, with the
|
|
# first of each pair of arguments being a symbol naming the type of the
|
|
# data that follows. If the type is :raw, the value is written directly
|
|
# to the hash.
|
|
#
|
|
# b = Buffer.from(:byte, 1, :string, "hello", :raw, "\1\2\3\4")
|
|
# #-> "\1\0\0\0\5hello\1\2\3\4"
|
|
#
|
|
# The supported data types are:
|
|
#
|
|
# * :raw => write the next value verbatim (#write)
|
|
# * :int64 => write an 8-byte integer (#write_int64)
|
|
# * :long => write a 4-byte integer (#write_long)
|
|
# * :byte => write a single byte (#write_byte)
|
|
# * :string => write a 4-byte length followed by character data (#write_string)
|
|
# * :bool => write a single byte, interpreted as a boolean (#write_bool)
|
|
# * :bignum => write an SSH-encoded bignum (#write_bignum)
|
|
# * :key => write an SSH-encoded key value (#write_key)
|
|
#
|
|
# Any of these, except for :raw, accepts an Array argument, to make it
|
|
# easier to write multiple values of the same type in a briefer manner.
|
|
def self.from(*args)
|
|
raise ArgumentError, "odd number of arguments given" unless args.length % 2 == 0
|
|
|
|
buffer = new
|
|
0.step(args.length-1, 2) do |index|
|
|
type = args[index]
|
|
value = args[index+1]
|
|
if type == :raw
|
|
buffer.append(value.to_s)
|
|
elsif Array === value
|
|
buffer.send("write_#{type}", *value)
|
|
else
|
|
buffer.send("write_#{type}", value)
|
|
end
|
|
end
|
|
|
|
buffer
|
|
end
|
|
|
|
# exposes the raw content of the buffer
|
|
attr_reader :content
|
|
|
|
# the current position of the pointer in the buffer
|
|
attr_accessor :position
|
|
|
|
# Creates a new buffer, initialized to the given content. The position
|
|
# is initialized to the beginning of the buffer.
|
|
def initialize(content="")
|
|
@content = content.to_s
|
|
@position = 0
|
|
end
|
|
|
|
# Returns the length of the buffer's content.
|
|
def length
|
|
@content.length
|
|
end
|
|
|
|
# Returns the number of bytes available to be read (e.g., how many bytes
|
|
# remain between the current position and the end of the buffer).
|
|
def available
|
|
length - position
|
|
end
|
|
|
|
# Returns a copy of the buffer's content.
|
|
def to_s
|
|
(@content || "").dup
|
|
end
|
|
|
|
# Compares the contents of the two buffers, returning +true+ only if they
|
|
# are identical in size and content.
|
|
def ==(buffer)
|
|
to_s == buffer.to_s
|
|
end
|
|
|
|
# Returns +true+ if the buffer contains no data (e.g., it is of zero length).
|
|
def empty?
|
|
@content.empty?
|
|
end
|
|
|
|
# Resets the pointer to the start of the buffer. Subsequent reads will
|
|
# begin at position 0.
|
|
def reset!
|
|
@position = 0
|
|
end
|
|
|
|
# Returns true if the pointer is at the end of the buffer. Subsequent
|
|
# reads will return nil, in this case.
|
|
def eof?
|
|
@position >= length
|
|
end
|
|
|
|
# Resets the buffer, making it empty. Also, resets the read position to
|
|
# 0.
|
|
def clear!
|
|
@content = ""
|
|
@position = 0
|
|
end
|
|
|
|
# Consumes n bytes from the buffer, where n is the current position
|
|
# unless otherwise specified. This is useful for removing data from the
|
|
# buffer that has previously been read, when you are expecting more data
|
|
# to be appended. It helps to keep the size of buffers down when they
|
|
# would otherwise tend to grow without bound.
|
|
#
|
|
# Returns the buffer object itself.
|
|
def consume!(n=position)
|
|
if n >= length
|
|
# optimize for a fairly common case
|
|
clear!
|
|
elsif n > 0
|
|
@content = @content[n..-1] || ""
|
|
@position -= n
|
|
@position = 0 if @position < 0
|
|
end
|
|
self
|
|
end
|
|
|
|
# Appends the given text to the end of the buffer. Does not alter the
|
|
# read position. Returns the buffer object itself.
|
|
def append(text)
|
|
@content << text
|
|
self
|
|
end
|
|
|
|
# Returns all text from the current pointer to the end of the buffer as
|
|
# a new Net::SSH::Buffer object.
|
|
def remainder_as_buffer
|
|
Buffer.new(@content[@position..-1])
|
|
end
|
|
|
|
# Reads all data up to and including the given pattern, which may be a
|
|
# String, Fixnum, or Regexp and is interpreted exactly as String#index
|
|
# does. Returns nil if nothing matches. Increments the position to point
|
|
# immediately after the pattern, if it does match. Returns all data up to
|
|
# and including the text that matched the pattern.
|
|
def read_to(pattern)
|
|
index = @content.index(pattern, @position) or return nil
|
|
length = case pattern
|
|
when String then pattern.length
|
|
when Fixnum then 1
|
|
when Regexp then $&.length
|
|
end
|
|
index && read(index+length)
|
|
end
|
|
|
|
# Reads and returns the next +count+ bytes from the buffer, starting from
|
|
# the read position. If +count+ is +nil+, this will return all remaining
|
|
# text in the buffer. This method will increment the pointer.
|
|
def read(count=nil)
|
|
count ||= length
|
|
count = length - @position if @position + count > length
|
|
@position += count
|
|
@content[@position-count, count]
|
|
end
|
|
|
|
# Reads (as #read) and returns the given number of bytes from the buffer,
|
|
# and then consumes (as #consume!) all data up to the new read position.
|
|
def read!(count=nil)
|
|
data = read(count)
|
|
consume!
|
|
data
|
|
end
|
|
|
|
# Return the next 8 bytes as a 64-bit integer (in network byte order).
|
|
# Returns nil if there are less than 8 bytes remaining to be read in the
|
|
# buffer.
|
|
def read_int64
|
|
hi = read_long or return nil
|
|
lo = read_long or return nil
|
|
return (hi << 32) + lo
|
|
end
|
|
|
|
# Return the next four bytes as a long integer (in network byte order).
|
|
# Returns nil if there are less than 4 bytes remaining to be read in the
|
|
# buffer.
|
|
def read_long
|
|
b = read(4) or return nil
|
|
b.unpack("N").first
|
|
end
|
|
|
|
# Read and return the next byte in the buffer. Returns nil if called at
|
|
# the end of the buffer.
|
|
def read_byte
|
|
b = read(1) or return nil
|
|
b.getbyte(0)
|
|
end
|
|
|
|
# Read and return an SSH2-encoded string. The string starts with a long
|
|
# integer that describes the number of bytes remaining in the string.
|
|
# Returns nil if there are not enough bytes to satisfy the request.
|
|
def read_string
|
|
length = read_long or return nil
|
|
read(length)
|
|
end
|
|
|
|
# Read a single byte and convert it into a boolean, using 'C' rules
|
|
# (i.e., zero is false, non-zero is true).
|
|
def read_bool
|
|
b = read_byte or return nil
|
|
b != 0
|
|
end
|
|
|
|
# Read a bignum (OpenSSL::BN) from the buffer, in SSH2 format. It is
|
|
# essentially just a string, which is reinterpreted to be a bignum in
|
|
# binary format.
|
|
def read_bignum
|
|
data = read_string
|
|
return unless data
|
|
OpenSSL::BN.new(data, 2)
|
|
end
|
|
|
|
# Read a key from the buffer. The key will start with a string
|
|
# describing its type. The remainder of the key is defined by the
|
|
# type that was read.
|
|
def read_key
|
|
type = read_string
|
|
return (type ? read_keyblob(type) : nil)
|
|
end
|
|
|
|
# Read a keyblob of the given type from the buffer, and return it as
|
|
# a key. Only RSA and DSA keys are supported.
|
|
def read_keyblob(type)
|
|
case type
|
|
when "ssh-dss"
|
|
key = OpenSSL::PKey::DSA.new
|
|
key.p = read_bignum
|
|
key.q = read_bignum
|
|
key.g = read_bignum
|
|
key.pub_key = read_bignum
|
|
|
|
when "ssh-rsa"
|
|
key = OpenSSL::PKey::RSA.new
|
|
key.e = read_bignum
|
|
key.n = read_bignum
|
|
|
|
else
|
|
raise NotImplementedError, "unsupported key type `#{type}'"
|
|
end
|
|
|
|
return key
|
|
end
|
|
|
|
# Reads the next string from the buffer, and returns a new Buffer
|
|
# object that wraps it.
|
|
def read_buffer
|
|
Buffer.new(read_string)
|
|
end
|
|
|
|
# Writes the given data literally into the string. Does not alter the
|
|
# read position. Returns the buffer object.
|
|
def write(*data)
|
|
data.each { |datum| @content << datum }
|
|
self
|
|
end
|
|
|
|
# Writes each argument to the buffer as a network-byte-order-encoded
|
|
# 64-bit integer (8 bytes). Does not alter the read position. Returns the
|
|
# buffer object.
|
|
def write_int64(*n)
|
|
n.each do |i|
|
|
hi = (i >> 32) & 0xFFFFFFFF
|
|
lo = i & 0xFFFFFFFF
|
|
@content << [hi, lo].pack("N2")
|
|
end
|
|
self
|
|
end
|
|
|
|
# Writes each argument to the buffer as a network-byte-order-encoded
|
|
# long (4-byte) integer. Does not alter the read position. Returns the
|
|
# buffer object.
|
|
def write_long(*n)
|
|
@content << n.pack("N*")
|
|
self
|
|
end
|
|
|
|
# Writes each argument to the buffer as a byte. Does not alter the read
|
|
# position. Returns the buffer object.
|
|
def write_byte(*n)
|
|
n.each { |b| @content << b.chr }
|
|
self
|
|
end
|
|
|
|
# Writes each argument to the buffer as an SSH2-encoded string. Each
|
|
# string is prefixed by its length, encoded as a 4-byte long integer.
|
|
# Does not alter the read position. Returns the buffer object.
|
|
def write_string(*text)
|
|
text.each do |string|
|
|
s = string.to_s
|
|
write_long(s.length)
|
|
write(s)
|
|
end
|
|
self
|
|
end
|
|
|
|
# Writes each argument to the buffer as a (C-style) boolean, with 1
|
|
# meaning true, and 0 meaning false. Does not alter the read position.
|
|
# Returns the buffer object.
|
|
def write_bool(*b)
|
|
b.each { |v| @content << (v ? "\1" : "\0") }
|
|
self
|
|
end
|
|
|
|
# Writes each argument to the buffer as a bignum (SSH2-style). No
|
|
# checking is done to ensure that the arguments are, in fact, bignums.
|
|
# Does not alter the read position. Returns the buffer object.
|
|
def write_bignum(*n)
|
|
@content << n.map { |b| b.to_ssh }.join
|
|
self
|
|
end
|
|
|
|
# Writes the given arguments to the buffer as SSH2-encoded keys. Does not
|
|
# alter the read position. Returns the buffer object.
|
|
def write_key(*key)
|
|
key.each { |k| append(k.to_blob) }
|
|
self
|
|
end
|
|
end
|
|
end; end;
|