Skip to content

gh-80254: Disallow recursive usage of cursors in sqlite3 converters #29054

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JelleZijlstra merged 15 commits into from
May 3, 2022
Merged

gh-80254: Disallow recursive usage of cursors in sqlite3 converters #29054

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
c79e784
bpo-36073: Raise ProgrammingError on recursive usage of cursors in sq…
sir-sigurd Feb 12, 2019
6c3bc37
Merge remote-tracking branch 'upstream/main' into sqlite-converter-se…
Oct 19, 2021
bb0a729
Use subTest
Oct 19, 2021
51ab551
Address review: Apply Sergey's suggestions
Oct 19, 2021
f737b6e
Also check exception message
Oct 19, 2021
94b48cb
Merge branch 'main' into sqlite-converter-segfault
Nov 1, 2021
d3f6c94
Merge branch 'main' into sqlite-converter-segfault
Nov 16, 2021
2b8fddd
Merge branch 'main' into sqlite-converter-segfault
Jan 22, 2022
119f800
Merge branch 'main' into sqlite-converter-segfault
Feb 27, 2022
3f80f28
Sync with main
erlend-aasland May 2, 2022
ee8c8c2
Make NEWS entry more accurate
erlend-aasland May 2, 2022
abd7d10
Inline check_cursor_locked
erlend-aasland May 2, 2022
85e1386
Add comment, explaining why we do this
erlend-aasland May 2, 2022
7bcfc63
Also mention issue number in regression tests
erlend-aasland May 2, 2022
5c7cb3d
Merge branch 'main' into sqlite-converter-segfault
JelleZijlstra May 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Address review: Apply Sergey's suggestions
  • Loading branch information
Erlend E. Aasland
Erlend E. Aasland committed Oct 19, 2021
commit 51ab5518d6f4b55a782fd910d2382a9fa32b626a
38 changes: 23 additions & 15 deletions Lib/sqlite3/test/test_regression.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@
import sqlite3 as sqlite
import weakref
import functools
from test import support

from .test_dbapi import managed_connect
from test import support
from unittest.mock import patch

class RegressionTests(unittest.TestCase):
def setUp(self):
Expand Down Expand Up @@ -489,27 +490,34 @@ def test_executescript_step_through_select(self):

class ConverterProgrammingErrorTestCase(unittest.TestCase):
def setUp(self):
self.con = sqlite.connect(":memory:", detect_types=sqlite.PARSE_COLNAMES)
self.con = sqlite.connect(":memory:",
detect_types=sqlite.PARSE_COLNAMES)
self.cur = self.con.cursor()
self.cur.execute("create table test(x foo)")
self.cur.executemany("insert into test(x) values (?)", [("foo",), ("bar",)])

sqlite.converters["CURSOR_INIT"] = lambda x: self.cur.__init__(self.con)
sqlite.converters["CURSOR_CLOSE"] = lambda x: self.cur.close()
sqlite.converters["CURSOR_ITER"] = lambda x, l=[]: self.cur.fetchone() if l else l.append(None)
self.cur.executemany("insert into test(x) values (?)",
[("foo",), ("bar",)])

def tearDown(self):
del sqlite.converters["CURSOR_INIT"]
del sqlite.converters["CURSOR_CLOSE"]
del sqlite.converters["CURSOR_ITER"]
self.cur.close()
self.con.close()

def test_recursive_cursor_usage(self):
for converter in "CURSOR_INIT", "CURSOR_CLOSE", "CURSOR_ITER":
with self.subTest(converter=converter):
self.cur.execute(f'select x as "x [{converter}]", x from test')
self.assertRaises(sqlite.ProgrammingError, self.cur.fetchall)
def test_recursive_cursor_init(self):
conv = lambda x: self.cur.__init__(self.con)
with patch.dict(sqlite.converters, {"INIT": conv}):
self.cur.execute(f'select x as "x [INIT]", x from test')
self.assertRaises(sqlite.ProgrammingError, self.cur.fetchall)

def test_recursive_cursor_close(self):
conv = lambda x: self.cur.close()
with patch.dict(sqlite.converters, {"CLOSE": conv}):
self.cur.execute(f'select x as "x [CLOSE]", x from test')
self.assertRaises(sqlite.ProgrammingError, self.cur.fetchall)

def test_recursive_cursor_iter(self):
conv = lambda x, l=[]: self.cur.fetchone() if l else l.append(None)
with patch.dict(sqlite.converters, {"ITER": conv}):
self.cur.execute(f'select x as "x [ITER]", x from test')
self.assertRaises(sqlite.ProgrammingError, self.cur.fetchall)


if __name__ == "__main__":
Expand Down