1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support connecting Oracle DB as system user

Browse Source 
Adding support to different authentication modes to Oracle DB.
Adjust the connection string parsing a little bit as a drive-by.

Change-Id: I24ed70ed5085f22ba58eff70caa685579d31c96f
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
This commit is contained in:
Johannes Oikarinen 2022-10-21 14:35:42 +03:00 committed by Christian Ehrlicher
parent ebd94489a3
commit cf2651ae80
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/plugins/sqldrivers/oci/qsql_oci.cpp
View File

@ -196,6 +196,7 @@ public:
OCISession *authp = nullptr; OCISession *authp = nullptr;
OCITrans *trans = nullptr; OCITrans *trans = nullptr;
OCIError *err = nullptr; OCIError *err = nullptr;
ub4 authMode = OCI_DEFAULT;
bool transaction = false; bool transaction = false;
int serverVersion = -1; int serverVersion = -1;
int prefetchRows = -1; int prefetchRows = -1;
@ -2193,17 +2194,16 @@ bool QOCIDriver::hasFeature(DriverFeature f) const
static void qParseOpts(const QString &options, QOCIDriverPrivate *d) static void qParseOpts(const QString &options, QOCIDriverPrivate *d)
{ {
const QStringList opts(options.split(u';', Qt::SkipEmptyParts)); const QVector<QStringView> opts(QStringView(options).split(u';', Qt::SkipEmptyParts));
for (int i = 0; i < opts.count(); ++i) { for (const auto tmp : opts) {
const QString tmp(opts.at(i));
qsizetype idx; qsizetype idx;
if ((idx = tmp.indexOf(u'=')) == -1) { if ((idx = tmp.indexOf(u'=')) == -1) {
qWarning("QOCIDriver::parseArgs: Invalid parameter: '%s'", qWarning("QOCIDriver::parseArgs: Invalid parameter: '%s'",
tmp.toLocal8Bit().constData()); tmp.toLocal8Bit().constData());
continue; continue;
} }
const QString opt = tmp.left(idx); const QStringView opt = tmp.left(idx);
const QString val = tmp.mid(idx + 1).simplified(); const QStringView val = tmp.mid(idx + 1).trimmed();
bool ok; bool ok;
if (opt == "OCI_ATTR_PREFETCH_ROWS"_L1) { if (opt == "OCI_ATTR_PREFETCH_ROWS"_L1) {
d->prefetchRows = val.toInt(&ok); d->prefetchRows = val.toInt(&ok);
@ -2213,9 +2213,18 @@ static void qParseOpts(const QString &options, QOCIDriverPrivate *d)
d->prefetchMem = val.toInt(&ok); d->prefetchMem = val.toInt(&ok);
if (!ok) if (!ok)
d->prefetchMem = -1; d->prefetchMem = -1;
} else if (opt == "OCI_AUTH_MODE"_L1) {
if (val == "OCI_SYSDBA"_L1) {
d->authMode = OCI_SYSDBA;
} else if (val == "OCI_SYSOPER"_L1) {
d->authMode = OCI_SYSOPER;
} else if (val != "OCI_DEFAULT"_L1) {
qWarning("QOCIDriver::parseArgs: Unsupported value for OCI_AUTH_MODE: '%s'",
val.toLocal8Bit().constData());
}
} else { } else {
qWarning ("QOCIDriver::parseArgs: Invalid parameter: '%s'", qWarning("QOCIDriver::parseArgs: Invalid parameter: '%s'",
opt.toLocal8Bit().constData()); opt.toLocal8Bit().constData());
} }
} }
} }
@ -2279,9 +2288,9 @@ bool QOCIDriver::open(const QString & db,
if (r == OCI_SUCCESS) { if (r == OCI_SUCCESS) {
if (user.isEmpty() && password.isEmpty()) if (user.isEmpty() && password.isEmpty())
r = OCISessionBegin(d->svc, d->err, d->authp, OCI_CRED_EXT, OCI_DEFAULT); r = OCISessionBegin(d->svc, d->err, d->authp, OCI_CRED_EXT, d->authMode);
else else
r = OCISessionBegin(d->svc, d->err, d->authp, OCI_CRED_RDBMS, OCI_DEFAULT); r = OCISessionBegin(d->svc, d->err, d->authp, OCI_CRED_RDBMS, d->authMode);
} }
if (r == OCI_SUCCESS || r == OCI_SUCCESS_WITH_INFO) if (r == OCI_SUCCESS || r == OCI_SUCCESS_WITH_INFO)
r = OCIAttrSet(d->svc, OCI_HTYPE_SVCCTX, d->authp, 0, OCI_ATTR_SESSION, d->err); r = OCIAttrSet(d->svc, OCI_HTYPE_SVCCTX, d->authp, 0, OCI_ATTR_SESSION, d->err);

7
src/sql/doc/src/sql-driver.qdoc
View File

@ -318,6 +318,13 @@
\li Sets the OCI attribute \li Sets the OCI attribute
\l {https://docs.oracle.com/database/121/LNOCI/oci04sql.htm#LNOCI16355} \l {https://docs.oracle.com/database/121/LNOCI/oci04sql.htm#LNOCI16355}
{OCI_ATTR_PREFETCH_MEMORY} to the specified value {OCI_ATTR_PREFETCH_MEMORY} to the specified value
\row
\li OCI_AUTH_MODE
\li OCI_SYSDBA: authenticate for SYSDBA access\br
OCI_SYSOPER: authenticate for SYSOPER access\br
OCI_DEFAULT: authenticate with normal access\br
see \l {https://docs.oracle.com/cd/B10500_01/appdev.920/a96584/oci15r13.htm}
{OCISessionBegin} for more information about the access modes
\endtable \endtable
\section3 How to Build the OCI Plugin on Unix and \macos \section3 How to Build the OCI Plugin on Unix and \macos