← Back to branch summary

~ubuntu-branches/ubuntu/utopic/suricata/utopic

~ubuntu-branches/ubuntu/utopic/suricata/utopic

« back to all changes in this revision

Viewing changes to libhtp/htp/htp_util.c

Committer: Package Import Robot
Author(s): Pierre Chifflier
Date: 2011-11-17 23:20:51 UTC
mfrom: (1.1.10)
Revision ID: package-import@ubuntu.com-20111117232051-wlo0g2fyinx0zi25

Tags: 1.1-1

* Imported Upstream version 1.1
* Add instructions on getting new rules using oinkmaster
* Add Recommends on oinkmaster
* Move snort-rules-default to Recommends

files added:
qa

qa/Makefile.am

qa/Makefile.in

qa/coccinelle

qa/coccinelle/Makefile.am

qa/coccinelle/Makefile.in

qa/coccinelle/access-pkt-packet.cocci

qa/coccinelle/banned-functions.cocci

qa/coccinelle/direct-packet.cocci

qa/coccinelle/pktnotset-packet.cocci

qa/coccinelle/run_check.sh

qa/wirefuzz.pl

reference.config

rules

rules/decoder-events.rules

rules/stream-events.rules

src/alert-pcapinfo.c

src/alert-pcapinfo.h

src/alert-syslog.c

src/alert-syslog.h

src/app-layer-protos.c

src/app-layer-smtp.c

src/app-layer-smtp.h

src/cuda-ptxdump.h

src/decode-sctp.c

src/decode-sctp.h

src/detect-byte-extract.c

src/detect-byte-extract.h

src/detect-engine-event.c

src/detect-engine-event.h

src/detect-engine-hcbd.c

src/detect-engine-hcbd.h

src/detect-engine-hcd.c

src/detect-engine-hcd.h

src/detect-engine-hhd.c

src/detect-engine-hhd.h

src/detect-engine-hmd.c

src/detect-engine-hmd.h

src/detect-engine-hrhd.c

src/detect-engine-hrhd.h

src/detect-engine-hrud.c

src/detect-engine-hrud.h

src/detect-http-raw-header.c

src/detect-http-raw-header.h

src/detect-http-raw-uri.c

src/detect-http-raw-uri.h

src/detect-http-stat-code.c

src/detect-http-stat-code.h

src/detect-http-stat-msg.c

src/detect-http-stat-msg.h

src/detect-mark.c

src/detect-mark.h

src/detect-replace.c

src/detect-replace.h

src/detect-ssl-state.c

src/detect-ssl-state.h

src/detect-ssl-version.c

src/detect-ssl-version.h

src/flow-manager.c

src/flow-manager.h

src/flow-timeout.c

src/flow-timeout.h

src/log-droplog.c

src/log-droplog.h

src/log-pcap.c

src/log-pcap.h

src/runmode-af-packet.c

src/runmode-af-packet.h

src/runmode-erf-dag.c

src/runmode-erf-dag.h

src/runmode-erf-file.c

src/runmode-erf-file.h

src/runmode-ipfw.c

src/runmode-ipfw.h

src/runmode-nfq.c

src/runmode-nfq.h

src/runmode-pcap-file.c

src/runmode-pcap-file.h

src/runmode-pcap.c

src/runmode-pcap.h

src/runmode-pfring.c

src/runmode-pfring.h

src/source-af-packet.c

src/source-af-packet.h

src/stream-tcp-inline.c

src/stream-tcp-inline.h

src/stream-tcp-sack.c

src/stream-tcp-sack.h

src/stream-tcp-util.c

src/stream-tcp-util.h

src/tm-threads-common.h

src/util-affinity.c

src/util-affinity.h

src/util-checksum.c

src/util-checksum.h

src/util-device.c

src/util-device.h

src/util-ioctl.c

src/util-ioctl.h

src/util-memcmp.c

src/util-memcmp.h

src/util-mpm-ac-gfbs.c

src/util-mpm-ac-gfbs.h

src/util-mpm-ac.c

src/util-mpm-ac.h

src/util-mpm-b2gc.c

src/util-mpm-b2gc.h

src/util-mpm-b2gm.c

src/util-mpm-b2gm.h

src/util-optimize.h

src/util-proto-name.c

src/util-proto-name.h

src/util-reference-config.c

src/util-reference-config.h

src/util-runmodes.c

src/util-runmodes.h

src/util-syslog.c

src/util-syslog.h

src/util-vector.h

files removed:
src/alert-unified-alert.c

src/alert-unified-alert.h

src/alert-unified-log.c

src/alert-unified-log.h

src/app-layer-tls.c

src/app-layer-tls.h

src/detect-decode-event.c

src/detect-decode-event.h

files modified:
ChangeLog

Makefile.am

Makefile.in

aclocal.m4

config.guess

config.h.in

config.sub

configure

configure.in

debian/README.Debian

debian/changelog

debian/control

doc/INSTALL

doc/INSTALL.PF_RING

doc/INSTALL.WINDOWS

libhtp/Makefile.in

libhtp/aclocal.m4

libhtp/configure

libhtp/htp/Makefile.am

libhtp/htp/Makefile.in

libhtp/htp/bstr.c

libhtp/htp/bstr.h

libhtp/htp/dslib.c

libhtp/htp/hooks.c

libhtp/htp/hooks.h

libhtp/htp/htp.c

libhtp/htp/htp.h

libhtp/htp/htp_config.c

libhtp/htp/htp_connection.c

libhtp/htp/htp_connection_parser.c

libhtp/htp/htp_decompressors.c

libhtp/htp/htp_decompressors.h

libhtp/htp/htp_parsers.c

libhtp/htp/htp_request.c

libhtp/htp/htp_request_apache_2_2.c

libhtp/htp/htp_request_generic.c

libhtp/htp/htp_request_parsers.c

libhtp/htp/htp_response.c

libhtp/htp/htp_response_generic.c

libhtp/htp/htp_transaction.c

libhtp/htp/htp_util.c

libhtp/htp/utf8_decoder.h

libhtp/test/Makefile.am

libhtp/test/Makefile.in

libhtp/test/main.c

libhtp/test/test.c

ltmain.sh

m4/libtool.m4

m4/ltoptions.m4

m4/ltversion.m4

m4/lt~obsolete.m4

src/Makefile.am

src/Makefile.in

src/action-globals.h

src/alert-debuglog.c

src/alert-fastlog.c

src/alert-fastlog.h

src/alert-prelude.c

src/alert-unified2-alert.c

src/app-layer-dcerpc-common.h

src/app-layer-dcerpc-udp.c

src/app-layer-dcerpc.c

src/app-layer-detect-proto.c

src/app-layer-detect-proto.h

src/app-layer-ftp.c

src/app-layer-ftp.h

src/app-layer-htp.c

src/app-layer-htp.h

src/app-layer-parser.c

src/app-layer-parser.h

src/app-layer-protos.h

src/app-layer-smb.c

src/app-layer-smb.h

src/app-layer-smb2.c

src/app-layer-ssh.c

src/app-layer-ssh.h

src/app-layer-ssl.c

src/app-layer-ssl.h

src/app-layer.c

src/app-layer.h

src/conf-yaml-loader.c

src/conf-yaml-loader.h

src/conf.c

src/conf.h

src/counters.c

src/counters.h

src/cuda-packet-batcher.c

src/cuda-packet-batcher.h

src/data-queue.h

src/decode-ethernet.c

src/decode-events.h

src/decode-gre.c

src/decode-icmpv4.c

src/decode-icmpv4.h

src/decode-icmpv6.c

src/decode-icmpv6.h

src/decode-ipv4.c

src/decode-ipv4.h

src/decode-ipv6.c

src/decode-ipv6.h

src/decode-ppp.c

src/decode-pppoe.c

src/decode-raw.c

src/decode-sll.c

src/decode-tcp.c

src/decode-tcp.h

src/decode-udp.c

src/decode-vlan.c

src/decode.c

src/decode.h

src/defrag.c

src/defrag.h

src/detect-ack.c

src/detect-asn1.c

src/detect-bytejump.c

src/detect-bytejump.h

src/detect-bytetest.c

src/detect-bytetest.h

src/detect-content.c

src/detect-content.h

src/detect-csum.c

src/detect-dce-iface.c

src/detect-dce-opnum.c

src/detect-dce-stub-data.c

src/detect-depth.c

src/detect-detection-filter.c

src/detect-distance.c

src/detect-dsize.c

src/detect-engine-address-ipv4.c

src/detect-engine-address-ipv6.c

src/detect-engine-address.c

src/detect-engine-address.h

src/detect-engine-alert.c

src/detect-engine-alert.h

src/detect-engine-dcepayload.c

src/detect-engine-iponly.c

src/detect-engine-iponly.h

src/detect-engine-mpm.c

src/detect-engine-mpm.h

src/detect-engine-payload.c

src/detect-engine-port.c

src/detect-engine-proto.c

src/detect-engine-siggroup.c

src/detect-engine-sigorder.c

src/detect-engine-state.c

src/detect-engine-state.h

src/detect-engine-tag.c

src/detect-engine-threshold.c

src/detect-engine-threshold.h

src/detect-engine-uri.c

src/detect-engine.c

src/detect-engine.h

src/detect-fast-pattern.c

src/detect-fast-pattern.h

src/detect-flags.c

src/detect-flow.c

src/detect-flowbits.c

src/detect-flowint.c

src/detect-flowvar.c

src/detect-fragbits.c

src/detect-fragoffset.c

src/detect-ftpbounce.c

src/detect-gid.h

src/detect-http-client-body.c

src/detect-http-client-body.h

src/detect-http-cookie.c

src/detect-http-cookie.h

src/detect-http-header.c

src/detect-http-header.h

src/detect-http-method.c

src/detect-http-method.h

src/detect-http-uri.c

src/detect-icmp-id.c

src/detect-icmp-seq.c

src/detect-icode.c

src/detect-id.c

src/detect-ipopts.c

src/detect-ipproto.c

src/detect-ipproto.h

src/detect-isdataat.c

src/detect-isdataat.h

src/detect-itype.c

src/detect-msg.c

src/detect-nocase.c

src/detect-offset.c

src/detect-parse.c

src/detect-parse.h

src/detect-pcre.c

src/detect-pcre.h

src/detect-pktvar.c

src/detect-priority.c

src/detect-rawbytes.c

src/detect-reference.c

src/detect-reference.h

src/detect-rev.c

src/detect-rpc.c

src/detect-sameip.c

src/detect-seq.c

src/detect-sid.c

src/detect-ssh-proto-version.c

src/detect-ssh-software-version.c

src/detect-stream_size.c

src/detect-tag.c

src/detect-tag.h

src/detect-threshold.c

src/detect-threshold.h

src/detect-tls-version.c

src/detect-ttl.c

src/detect-uricontent.c

src/detect-uricontent.h

src/detect-urilen.c

src/detect-window.c

src/detect-within.c

src/detect.c

src/detect.h

src/flow-hash.c

src/flow-private.h

src/flow-queue.c

src/flow-queue.h

src/flow-util.c

src/flow-util.h

src/flow.c

src/flow.h

src/log-httplog.c

src/output.c

src/output.h

src/queue.h

src/respond-reject-libnet11.c

src/respond-reject.c

src/respond-reject.h

src/runmodes.c

src/runmodes.h

src/source-erf-dag.c

src/source-erf-file.c

src/source-ipfw.c

src/source-nfq.c

src/source-nfq.h

src/source-pcap-file.c

src/source-pcap.c

src/source-pcap.h

src/source-pfring.c

src/source-pfring.h

src/stream-tcp-private.h

src/stream-tcp-reassemble.c

src/stream-tcp-reassemble.h

src/stream-tcp.c

src/stream-tcp.h

src/stream.c

src/stream.h

src/suricata-common.h

src/suricata.c

src/suricata.h

src/threads.c

src/threads.h

src/threadvars.h

src/tm-modules.c

src/tm-modules.h

src/tm-queues.c

src/tm-threads.c

src/tm-threads.h

src/tmqh-flow.c

src/tmqh-packetpool.c

src/tmqh-packetpool.h

src/tmqh-ringbuffer.c

src/tmqh-simple.c

src/util-atomic.h

src/util-bloomfilter-counting.c

src/util-bloomfilter.h

src/util-byte.c

src/util-byte.h

src/util-classification-config.c

src/util-cpu.c

src/util-cuda-handlers.c

src/util-cuda-handlers.h

src/util-cuda.c

src/util-cuda.h

src/util-daemon.c

src/util-debug-filters.c

src/util-debug.c

src/util-debug.h

src/util-decode-asn1.c

src/util-error.c

src/util-error.h

src/util-fmemopen.c

src/util-fmemopen.h

src/util-hash.c

src/util-hashlist.c

src/util-mem.h

src/util-mpm-b2g-cuda.c

src/util-mpm-b2g-cuda.h

src/util-mpm-b2g.c

src/util-mpm-b2g.h

src/util-mpm-b3g.c

src/util-mpm-b3g.h

src/util-mpm-wumanber.c

src/util-mpm.c

src/util-mpm.h

src/util-pool.c

src/util-print.c

src/util-print.h

src/util-privs.c

src/util-profiling.c

src/util-profiling.h

src/util-radix-tree.c

src/util-radix-tree.h

src/util-ringbuffer.h

src/util-spm-bm.c

src/util-spm-bs.c

src/util-spm-bs2bm.c

src/util-spm.c

src/util-threshold-config.c

src/util-unittest-helper.c

src/util-unittest-helper.h

src/util-unittest.c

src/util-unittest.h

src/util-validate.h

src/util-var-name.c

src/win32-misc.c

src/win32-misc.h

src/win32-service.c

suricata.yaml

Show diffs side-by-side

added added

removed removed

libhtp/htp/htp_util.c

198

198

199

199

/**

200

200

* Does line consist entirely of whitespace characters?

201

*

201

*

202

202

* @param data

203

203

* @param len

204

204

* @return 0 or 1

241

241

/**

242

242

* A forgiving parser for a positive integer in a given base.

243

243

* White space is allowed before and after the number.

244

*

244

*

245

245

* @param data

246

246

* @param len

247

247

* @param base

271

271

272

272

/**

273

273

* Prints one log message to stderr.

274

*

274

*

275

275

* @param log

276

276

*/

277

277

void htp_print_log(FILE *stream, htp_log_t *log) {

286

286

287

287

/**

288

288

* Records one log message.

289

*

289

*

290

290

* @param connp

291

291

* @param file

292

292

* @param line

428

428

// Failed to parse port

429

429

htp_log(connp, HTP_LOG_MARK, HTP_LOG_ERROR, 0, "Invalid server port information in request");

430

430

} else if ((port > 0) && (port < 65536)) {

431

// Valid port

431

// Valid port

432

432

(*uri)->port_number = port;

433

433

} else {

434

434

htp_log(connp, HTP_LOG_MARK, HTP_LOG_ERROR, 0, "Invalid authority port");

440

440

441

441

/**

442

442

* Parses request URI, making no attempt to validate the contents.

443

*

443

*

444

444

* @param input

445

445

* @param uri

446

446

* @return HTP_ERROR on memory allocation failure, HTP_OK otherwise

467

467

// Scheme test: if it doesn't start with a forward slash character (which it must

468

468

// for the contents to be a path or an authority, then it must be the scheme part

469

469

if (data[0] != '/') {

470

// Parse scheme

470

// Parse scheme

471

471

472

472

// Find the colon, which marks the end of the scheme part

473

473

start = pos;

1716

1716

bstr *htp_unparse_uri_noencode(htp_uri_t *uri) {

1717

1717

if (uri == NULL) {

1718

1718

return NULL;

1719

}

1719

}

1720

1720

1721

1721

// On the first pass determine the length of the final string

1722

1722

size_t len = 0;

1738

1738

}

1739

1739

1740

1740

len += 1; // "@"

1741

}

1741

}

1742

1742

1743

1743

if (uri->hostname != NULL) {

1744

1744

len += bstr_len(uri->hostname);

1745

}

1745

}

1746

1746

1747

1747

if (uri->port != NULL) {

1748

1748

len += 1; // ":"

1761

1761

if (uri->fragment != NULL) {

1762

1762

len += 1; // "#"

1763

1763

len += bstr_len(uri->fragment);

1764

}

1764

}

1765

1765

1766

1766

// On the second pass construct the string

1767

1767

bstr *r = bstr_alloc(len);

1768

1768

if (r == NULL) {

1769

1769

return NULL;

1770

}

1770

}

1771

1771

1772

1772

if (uri->scheme != NULL) {

1773

1773

bstr_add_str_noex(r, uri->scheme);

1774

1774

bstr_add_cstr_noex(r, "://");

1775

}

1775

}

1776

1776

1777

1777

if ((uri->username != NULL) || (uri->password != NULL)) {

1778

1778

if (uri->username != NULL) {

1786

1786

}

1787

1787

1788

1788

bstr_add_cstr_noex(r, "@");

1789

}

1789

}

1790

1790

1791

1791

if (uri->hostname != NULL) {

1792

1792

bstr_add_str_noex(r, uri->hostname);

1793

}

1793

}

1794

1794

1795

1795

if (uri->port != NULL) {

1796

1796

bstr_add_cstr(r, ":");

1797

1797

bstr_add_str_noex(r, uri->port);

1798

}

1798

}

1799

1799

1800

1800

if (uri->path != NULL) {

1801

1801

bstr_add_str_noex(r, uri->path);

1802

}

1802

}

1803

1803

1804

1804

if (uri->query != NULL) {

1805

1805

bstr *query = bstr_strdup(uri->query);

1807

1807

bstr_add_cstr_noex(r, "?");

1808

1808

bstr_add_str_noex(r, query);

1809

1809

bstr_free(query);

1810

}

1810

}

1811

1811

1812

1812

if (uri->fragment != NULL) {

1813

1813

bstr_add_cstr_noex(r, "#");

1814

1814

bstr_add_str_noex(r, uri->fragment);

1815

1815

}

1816

1816

1817

1817

return r;

1818

1818

}

1819

1819

Older »