Skip to content

Commit 1d32f6e

Browse files
redsun82redsun82
authored
Merge branch 'main' into alexdenisov+redsun82/tuple-mangling
2 parents bab4eee + 798f388 commit 1d32f6e

File tree

179 files changed

+192
-3074
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

179 files changed

+192
-3074
lines changed

‎java/documentation/library-coverage/coverage.csv‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ java.io,49,,45,,22,,,,,,,,,,,,,,27,,,,,,,,,,,,,,,,,,,43,2
5858
java.lang,18,,92,,,,,,,,,,,,,8,,,5,,,4,,,1,,,,,,,,,,,,,56,36
5959
java.net,13,3,20,,,,,,,,,,,,,,,,,,,,,,,,,13,,,,,,,,,3,20,
6060
java.nio,47,,35,,3,,,,,,,,,,,,,,44,,,,,,,,,,,,,,,,,,,35,
61-
java.sql,13,,3,,,,,,,,,,,,,,,,,,,,,,,,,4,,9,,,,,,,,2,1
61+
java.sql,13,,2,,,,,,,,,,,,,,,,,,,,,,,,,4,,9,,,,,,,,2,
6262
java.util,44,,484,,,,,,,,,,,,,34,,,,,,,5,2,,1,2,,,,,,,,,,,44,440
6363
javafx.scene.web,1,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,
6464
javax.faces.context,2,7,,,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,7,,

‎java/documentation/library-coverage/coverage.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ Java framework & library support
1818
`Google Guava <https://guava.dev/>`_,``com.google.common.*``,,730,41,7,,,,,
1919
JBoss Logging,``org.jboss.logging``,,,324,,,,,,
2020
`JSON-java <https://github.com/stleary/JSON-java>`_,``org.json``,,236,,,,,,,
21-
Java Standard Library,``java.*``,3,683,184,76,,9,,,17
21+
Java Standard Library,``java.*``,3,682,184,76,,9,,,17
2222
Java extensions,"``javax.*``, ``jakarta.*``",63,611,34,2,4,,1,1,2
2323
Kotlin Standard Library,``kotlin*``,,1847,16,14,,,,,2
2424
`Spring <https://spring.io/>`_,``org.springframework.*``,29,483,115,4,,28,14,,35
2525
Others,"``cn.hutool.core.codec``, ``com.alibaba.druid.sql``, ``com.esotericsoftware.kryo.io``, ``com.esotericsoftware.kryo5.io``, ``com.fasterxml.jackson.core``, ``com.fasterxml.jackson.databind``, ``com.google.gson``, ``com.hubspot.jinjava``, ``com.jcraft.jsch``, ``com.mitchellbosecke.pebble``, ``com.opensymphony.xwork2.ognl``, ``com.rabbitmq.client``, ``com.thoughtworks.xstream``, ``com.unboundid.ldap.sdk``, ``com.zaxxer.hikari``, ``flexjson``, ``freemarker.cache``, ``freemarker.template``, ``groovy.lang``, ``groovy.text``, ``groovy.util``, ``hudson``, ``io.jsonwebtoken``, ``io.netty.bootstrap``, ``io.netty.buffer``, ``io.netty.channel``, ``io.netty.handler.codec``, ``io.netty.handler.ssl``, ``io.netty.handler.stream``, ``io.netty.resolver``, ``io.netty.util``, ``javafx.scene.web``, ``jodd.json``, ``net.sf.saxon.s9api``, ``ognl``, ``okhttp3``, ``org.antlr.runtime``, ``org.apache.commons.codec``, ``org.apache.commons.compress.archivers.tar``, ``org.apache.commons.httpclient.util``, ``org.apache.commons.jelly``, ``org.apache.commons.jexl2``, ``org.apache.commons.jexl3``, ``org.apache.commons.logging``, ``org.apache.commons.net``, ``org.apache.commons.ognl``, ``org.apache.directory.ldap.client.api``, ``org.apache.hadoop.fs``, ``org.apache.hadoop.hive.metastore``, ``org.apache.hc.client5.http.async.methods``, ``org.apache.hc.client5.http.classic.methods``, ``org.apache.hc.client5.http.fluent``, ``org.apache.hive.hcatalog.templeton``, ``org.apache.ibatis.jdbc``, ``org.apache.log4j``, ``org.apache.shiro.codec``, ``org.apache.shiro.jndi``, ``org.apache.tools.ant``, ``org.apache.tools.zip``, ``org.apache.velocity.app``, ``org.apache.velocity.runtime``, ``org.codehaus.cargo.container.installer``, ``org.codehaus.groovy.control``, ``org.dom4j``, ``org.eclipse.jetty.client``, ``org.fusesource.leveldbjni``, ``org.geogebra.web.full.main``, ``org.hibernate``, ``org.influxdb``, ``org.jdbi.v3.core``, ``org.jooq``, ``org.kohsuke.stapler``, ``org.mvel2``, ``org.openjdk.jmh.runner.options``, ``org.scijava.log``, ``org.slf4j``, ``org.thymeleaf``, ``org.xml.sax``, ``org.xmlpull.v1``, ``org.yaml.snakeyaml``, ``play.libs.ws``, ``play.mvc``, ``ratpack.core.form``, ``ratpack.core.handling``, ``ratpack.core.http``, ``ratpack.exec``, ``ratpack.form``, ``ratpack.func``, ``ratpack.handling``, ``ratpack.http``, ``ratpack.util``, ``retrofit2``",98,899,528,66,,18,18,,195
26-
Totals,,255,9199,1997,263,10,122,33,1,385
26+
Totals,,255,9198,1997,263,10,122,33,1,385
2727

‎python/ql/lib/change-notes/2023-06-09-delete-deps.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
category: minorAnalysis
3+
---
4+
* Deleted many deprecated predicates and classes with uppercase `API`, `HTTP`, `XSS`, `SQL`, etc. in their names. Use the PascalCased versions instead.
5+
* Deleted the deprecated `getName()` predicate from the `Container` class, use `getAbsolutePath()` instead.
6+
* Deleted many deprecated module names that started with a lowercase letter, use the versions that start with an uppercase letter instead.
7+
* Deleted many deprecated predicates in `PointsTo.qll`.
8+
* Deleted many deprecated files from the `semmle.python.security` package.
9+
* Deleted the deprecated `BottleRoutePointToExtension` class from `Extensions.qll`.

‎python/ql/lib/semmle/python/Files.qll‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,12 +154,6 @@ abstract class Container extends @container {
154154
*/
155155
string toString() { result = this.getAbsolutePath() }
156156

157-
/**
158-
* Gets the name of this container.
159-
* DEPRECATED: Use `getAbsolutePath` instead.
160-
*/
161-
deprecated string getName() { result = this.getAbsolutePath() }
162-
163157
/**
164158
* Gets the relative path of this file or folder from the root folder of the
165159
* analyzed source location. The relative path of the root folder itself is

‎python/ql/lib/semmle/python/dataflow/old/TaintTracking.qll‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -664,14 +664,6 @@ module DataFlow {
664664
}
665665
}
666666

667-
deprecated private class DataFlowType extends TaintKind {
668-
// this only exists to avoid an empty recursion error in the type checker
669-
DataFlowType() {
670-
this = "Data flow" and
671-
1 = 2
672-
}
673-
}
674-
675667
pragma[noinline]
676668
private predicate dict_construct(ControlFlowNode itemnode, ControlFlowNode dictnode) {
677669
dictnode.(DictNode).getAValue() = itemnode

‎python/ql/lib/semmle/python/frameworks/Django.qll‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -534,9 +534,6 @@ module PrivateDjango {
534534
/** Gets a reference to the `django` module. */
535535
API::Node django() { result = API::moduleImport("django") }
536536

537-
/** DEPRECATED: Alias for `DjangoImpl` */
538-
deprecated module django = DjangoImpl;
539-
540537
/** Provides models for the `django` module. */
541538
module DjangoImpl {
542539
// -------------------------------------------------------------------------
@@ -552,9 +549,6 @@ module PrivateDjango {
552549
DjangoDb() { this = API::moduleImport("django").getMember("db") }
553550
}
554551

555-
/** DEPRECATED: Alias for `DB` */
556-
deprecated module db = DB;
557-
558552
/** Provides models for the `django.db` module. */
559553
module DB {
560554
/** Gets a reference to the `django.db.connection` object. */
@@ -571,9 +565,6 @@ module PrivateDjango {
571565
/** Gets a reference to the `django.db.models` module. */
572566
API::Node models() { result = db().getMember("models") }
573567

574-
/** DEPRECATED: Alias for `Models` */
575-
deprecated module models = Models;
576-
577568
/** Provides models for the `django.db.models` module. */
578569
module Models {
579570
/**
@@ -819,9 +810,6 @@ module PrivateDjango {
819810
/** Gets a reference to the `django.db.models.expressions` module. */
820811
API::Node expressions() { result = models().getMember("expressions") }
821812

822-
/** DEPRECATED: Alias for `Expressions` */
823-
deprecated module expressions = Expressions;
824-
825813
/** Provides models for the `django.db.models.expressions` module. */
826814
module Expressions {
827815
/** Provides models for the `django.db.models.expressions.RawSql` class. */
@@ -858,9 +846,6 @@ module PrivateDjango {
858846
instance(DataFlow::TypeTracker::end(), sql).flowsTo(result)
859847
}
860848
}
861-
862-
/** DEPRECATED: Alias for RawSql */
863-
deprecated module RawSQL = RawSql;
864849
}
865850

866851
/** This internal module provides data-flow modeling of Django ORM. */
@@ -1099,9 +1084,6 @@ module PrivateDjango {
10991084
/** Gets a reference to the `django.urls` module. */
11001085
API::Node urls() { result = django().getMember("urls") }
11011086

1102-
/** DEPRECATED: Alias for `Urls` */
1103-
deprecated module urls = Urls;
1104-
11051087
/** Provides models for the `django.urls` module */
11061088
module Urls {
11071089
/**
@@ -1123,14 +1105,8 @@ module PrivateDjango {
11231105
/** Gets a reference to the `django.conf` module. */
11241106
API::Node conf() { result = django().getMember("conf") }
11251107

1126-
/** DEPRECATED: Alias for `Conf` */
1127-
deprecated module conf = Conf;
1128-
11291108
/** Provides models for the `django.conf` module */
11301109
module Conf {
1131-
/** DEPRECATED: Alias for `ConfUrls` */
1132-
deprecated module conf_urls = ConfUrls;
1133-
11341110
/** Provides models for the `django.conf.urls` module */
11351111
module ConfUrls {
11361112
// -------------------------------------------------------------------------
@@ -1166,9 +1142,6 @@ module PrivateDjango {
11661142
/** Gets a reference to the `django.http.request` module. */
11671143
API::Node request() { result = http().getMember("request") }
11681144

1169-
/** DEPRECATED: Alias for `Request` */
1170-
deprecated module request = Request;
1171-
11721145
/** Provides models for the `django.http.request` module. */
11731146
module Request {
11741147
/**
@@ -1331,9 +1304,6 @@ module PrivateDjango {
13311304
/** Gets a reference to the `django.http.response` module. */
13321305
API::Node response() { result = http().getMember("response") }
13331306

1334-
/** DEPRECATED: Alias for `Response` */
1335-
deprecated module response = Response;
1336-
13371307
/** Provides models for the `django.http.response` module */
13381308
module Response {
13391309
/**
@@ -2189,9 +2159,6 @@ module PrivateDjango {
21892159
/** Gets a reference to the `django.shortcuts` module. */
21902160
API::Node shortcuts() { result = django().getMember("shortcuts") }
21912161

2192-
/** DEPRECATED: Alias for `Shortcuts` */
2193-
deprecated module shortcuts = Shortcuts;
2194-
21952162
/** Provides models for the `django.shortcuts` module */
21962163
module Shortcuts {
21972164
/**

‎python/ql/lib/semmle/python/frameworks/FastApi.qll‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@ private module FastApi {
3737
}
3838
}
3939

40-
/** DEPRECATED: Alias for ApiRouter */
41-
deprecated module APIRouter = ApiRouter;
42-
4340
// ---------------------------------------------------------------------------
4441
// routing modeling
4542
// ---------------------------------------------------------------------------

‎python/ql/lib/semmle/python/frameworks/RestFramework.qll‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,4 @@ private module RestFramework {
359359
override string getMimetypeDefault() { none() }
360360
}
361361
}
362-
363-
/** DEPRECATED: Alias for ApiException */
364-
deprecated module APIException = ApiException;
365362
}

‎python/ql/lib/semmle/python/frameworks/SqlAlchemy.qll‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,9 +169,6 @@ module SqlAlchemy {
169169
DataFlow::Node instance() { instance(DataFlow::TypeTracker::end()).flowsTo(result) }
170170
}
171171

172-
/** DEPRECATED: Alias for DBApiConnection */
173-
deprecated module DBAPIConnection = DBApiConnection;
174-
175172
/**
176173
* Provides models for the `sqlalchemy.orm.Session` class
177174
*

‎python/ql/lib/semmle/python/frameworks/Stdlib.qll‎

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,6 @@ module Stdlib {
130130
}
131131
}
132132

133-
/** DEPRECATED: Alias for HttpMessage */
134-
deprecated module HTTPMessage = HttpMessage;
135-
136133
/**
137134
* Provides models for the `http.cookies.Morsel` class
138135
*
@@ -1821,9 +1818,6 @@ private module StdlibPrivate {
18211818
/** Gets a reference to the `BaseHttpServer` module. */
18221819
API::Node baseHttpServer() { result = API::moduleImport("BaseHTTPServer") }
18231820

1824-
/** DEPRECATED: Alias for baseHttpServer */
1825-
deprecated API::Node baseHTTPServer() { result = baseHttpServer() }
1826-
18271821
/** Provides models for the `BaseHttpServer` module. */
18281822
module BaseHttpServer {
18291823
/**
@@ -1833,23 +1827,14 @@ private module StdlibPrivate {
18331827
/** Gets a reference to the `BaseHttpServer.BaseHttpRequestHandler` class. */
18341828
API::Node classRef() { result = baseHttpServer().getMember("BaseHTTPRequestHandler") }
18351829
}
1836-
1837-
/** DEPRECATED: Alias for BaseHttpRequestHandler */
1838-
deprecated module BaseHTTPRequestHandler = BaseHttpRequestHandler;
18391830
}
18401831

1841-
/** DEPRECATED: Alias for BaseHttpServer */
1842-
deprecated module BaseHTTPServer = BaseHttpServer;
1843-
18441832
// ---------------------------------------------------------------------------
18451833
// SimpleHTTPServer (Python 2 only)
18461834
// ---------------------------------------------------------------------------
18471835
/** Gets a reference to the `SimpleHttpServer` module. */
18481836
API::Node simpleHttpServer() { result = API::moduleImport("SimpleHTTPServer") }
18491837

1850-
/** DEPRECATED: Alias for simpleHttpServer */
1851-
deprecated API::Node simpleHTTPServer() { result = simpleHttpServer() }
1852-
18531838
/** Provides models for the `SimpleHttpServer` module. */
18541839
module SimpleHttpServer {
18551840
/**
@@ -1859,23 +1844,14 @@ private module StdlibPrivate {
18591844
/** Gets a reference to the `SimpleHttpServer.SimpleHttpRequestHandler` class. */
18601845
API::Node classRef() { result = simpleHttpServer().getMember("SimpleHTTPRequestHandler") }
18611846
}
1862-
1863-
/** DEPRECATED: Alias for SimpleHttpRequestHandler */
1864-
deprecated module SimpleHTTPRequestHandler = SimpleHttpRequestHandler;
18651847
}
18661848

1867-
/** DEPRECATED: Alias for SimpleHttpServer */
1868-
deprecated module SimpleHTTPServer = SimpleHttpServer;
1869-
18701849
// ---------------------------------------------------------------------------
18711850
// CGIHTTPServer (Python 2 only)
18721851
// ---------------------------------------------------------------------------
18731852
/** Gets a reference to the `CGIHTTPServer` module. */
18741853
API::Node cgiHttpServer() { result = API::moduleImport("CGIHTTPServer") }
18751854

1876-
/** DEPRECATED: Alias for cgiHttpServer */
1877-
deprecated API::Node cgiHTTPServer() { result = cgiHttpServer() }
1878-
18791855
/** Provides models for the `CGIHTTPServer` module. */
18801856
module CgiHttpServer {
18811857
/**
@@ -1919,9 +1895,6 @@ private module StdlibPrivate {
19191895
API::Node classRef() { result = server().getMember("BaseHTTPRequestHandler") }
19201896
}
19211897

1922-
/** DEPRECATED: Alias for BaseHttpRequestHandler */
1923-
deprecated module BaseHTTPRequestHandler = BaseHttpRequestHandler;
1924-
19251898
/**
19261899
* Provides models for the `http.server.SimpleHTTPRequestHandler` class (Python 3 only).
19271900
*
@@ -1932,9 +1905,6 @@ private module StdlibPrivate {
19321905
API::Node classRef() { result = server().getMember("SimpleHTTPRequestHandler") }
19331906
}
19341907

1935-
/** DEPRECATED: Alias for SimpleHttpRequestHandler */
1936-
deprecated module SimpleHTTPRequestHandler = SimpleHttpRequestHandler;
1937-
19381908
/**
19391909
* Provides models for the `http.server.CGIHTTPRequestHandler` class (Python 3 only).
19401910
*
@@ -1978,9 +1948,6 @@ private module StdlibPrivate {
19781948
HttpRequestHandlerClassDef() { this.getParent() = subclassRef().asSource().asExpr() }
19791949
}
19801950

1981-
/** DEPRECATED: Alias for HttpRequestHandlerClassDef */
1982-
deprecated class HTTPRequestHandlerClassDef = HttpRequestHandlerClassDef;
1983-
19841951
/**
19851952
* A source of instances of the `BaseHTTPRequestHandler` class or any subclass, extend this class to model new instances.
19861953
*
@@ -2352,9 +2319,6 @@ private module StdlibPrivate {
23522319
}
23532320
}
23542321

2355-
/** DEPRECATED: Alias for HttpConnection */
2356-
deprecated module HTTPConnection = HttpConnection;
2357-
23582322
/**
23592323
* Provides models for the `http.client.HTTPResponse` class
23602324
*
@@ -2424,9 +2388,6 @@ private module StdlibPrivate {
24242388
}
24252389
}
24262390

2427-
/** DEPRECATED: Alias for HttpResponse */
2428-
deprecated module HTTPResponse = HttpResponse;
2429-
24302391
// ---------------------------------------------------------------------------
24312392
// sqlite3
24322393
// ---------------------------------------------------------------------------

0 commit comments

Comments
 (0)